Bump version to 5.7.2

Previously, we would do a full directory/CDS refresh in response to any
change in system contacts. That can be expensive.

This changes the behavior to look at how many new contacts there after
being notified of a contact change.

- If there aren't any, we just sync names and stuff.
- If we just have a few new contacts, we'll sync just those specifically.
- If we have a lot, we'll do a full sync.

.github/workflows/android.yml

@@ -26,3 +26,10 @@ jobs:
 
     - name: Build with Gradle
       run: ./gradlew qa
+
+    - name: Archive reports for failed build
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: reports
+        path: '*/build/reports'

app/build.gradle

@@ -16,12 +16,6 @@ repositories {
             includeGroupByRegex "com\\.github\\.chrisbanes.*"
         }
     }
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
-        content {
-            includeGroupByRegex "me\\.leolin.*"
-        }
-    }
     maven {
         url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
         content {
@@ -44,6 +38,9 @@ repositories {
     mavenCentral()
     jcenter()
     mavenLocal()
+    maven {
+        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
+    }
 }
 
 protobuf {
@@ -61,8 +58,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 788
-def canonicalVersionName = "5.4.2"
+def canonicalVersionCode = 811
+def canonicalVersionName = "5.7.2"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -129,6 +126,8 @@ android {
         buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
+        buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
+        buildConfigField "int[]", "MOBILE_COIN_REGIONS", "new int[]{44}"
 
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -149,6 +148,7 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JAVA_VERSION
         targetCompatibility JAVA_VERSION
     }
@@ -161,6 +161,8 @@ android {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
         exclude 'META-INF/proguard/androidx-annotations.pro'
+        exclude '/org/spongycastle/x509/CertPathReviewerMessages.properties'
+        exclude '/org/spongycastle/x509/CertPathReviewerMessages_de.properties'
     }
 
     buildTypes {
@@ -208,6 +210,12 @@ android {
             debuggable false
             matchingFallbacks = ['debug']
         }
+        mock {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+        }
     }
 
     productFlavors {
@@ -233,10 +241,21 @@ android {
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
         }
 
+        study {
+            dimension 'distribution'
+
+            applicationIdSuffix ".study"
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+        }
+
         prod {
             dimension 'environment'
 
             isDefault true
+
+            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
         }
 
         staging {
@@ -252,11 +271,12 @@ android {
             buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
             buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
             buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
-                                                                         "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\", " +
+                                                                         "\"51a56084c0b21c6b8f62b1bc792ec9bedac4c7c3964bb08ddcab868158c09982\", " +
                                                                          "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
             buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
+            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
         }
     }
 
@@ -272,6 +292,18 @@ android {
         }
     }
 
+    android.variantFilter { variant ->
+        def distribution = variant.getFlavors().get(0).name
+        def environment  = variant.getFlavors().get(1).name
+        def buildType    = variant.buildType.name
+
+        if (distribution == 'study' && buildType != 'perf' && buildType != 'mock') {
+            variant.setIgnore(true)
+        } else if (distribution != 'study' && buildType == 'mock') {
+            variant.setIgnore(true)
+        }
+    }
+
     lintOptions {
         abortOnError true
         baseline file("lint-baseline.xml")
@@ -288,6 +320,8 @@ android {
 dependencies {
     lintChecks project(':lintchecks')
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
     implementation ('androidx.appcompat:appcompat:1.2.0') {
         force = true
     }
@@ -312,6 +346,7 @@ dependencies {
     implementation "androidx.camera:camera-view:1.0.0-alpha18"
     implementation "androidx.concurrent:concurrent-futures:1.0.0"
     implementation "androidx.autofill:autofill:1.0.0"
+    implementation "androidx.biometric:biometric:1.1.0"
 
     implementation ('com.google.firebase:firebase-messaging:20.2.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -333,15 +368,21 @@ dependencies {
     implementation project(':paging')
     implementation project(':core-util')
     implementation project(':video')
+    implementation project(':device-transfer')
 
     implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.2.3'
+    implementation 'org.whispersystems:signal-client-android:0.1.7'
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
+
+    implementation('com.mobilecoin:android-sdk:1.0.0') {
+        exclude group: 'com.google.protobuf'
+    }
+
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.9.2'
+    implementation 'org.signal:ringrtc-android:2.9.4'
 
-    implementation "me.leolin:ShortcutBadger:1.1.16"
+    implementation "me.leolin:ShortcutBadger:1.1.22"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
     implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'

app/src/main/AndroidManifest.xml

@@ -377,6 +377,16 @@
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
+        <activity android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:launchMode="singleTask"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+        <activity android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
+            android:noHistory="true"
+            android:excludeFromRecents="true"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".registration.RegistrationNavigationActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightRegistrationTheme"
@@ -487,6 +497,10 @@
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateVisible|adjustResize" />
 
+    <activity android:name=".payments.preferences.PaymentsActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".lock.v2.CreateKbsPinActivity"
             android:theme="@style/TextSecure.LightRegistrationTheme"
             android:windowSoftInputMode="adjustResize"
@@ -571,7 +585,7 @@
               android:screenOrientation="portrait"
               android:theme="@style/Theme.Signal.WallpaperCropper" />
 
-    <service android:enabled="true" android:name=".service.WebRtcCallService"/>
+    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService"/>
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
@@ -702,6 +716,8 @@
 
     <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
 
+    <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />
+
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"

app/src/main/java/androidx/camera/view/SignalCameraView.java

@@ -65,6 +65,8 @@ import androidx.lifecycle.LiveData;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
+import org.signal.core.util.logging.Log;
+
 import java.io.File;
 import java.util.concurrent.Executor;
 
@@ -82,7 +84,7 @@ import java.util.concurrent.Executor;
 @RequiresApi(21)
 @SuppressLint("RestrictedApi")
 public final class SignalCameraView extends FrameLayout {
-  static final String TAG = SignalCameraView.class.getSimpleName();
+  static final String TAG = Log.tag(SignalCameraView.class);
 
   static final int INDEFINITE_VIDEO_DURATION = -1;
   static final int INDEFINITE_VIDEO_SIZE = -1;

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

@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class APNGDecoder extends FrameSeqDecoder<APNGReader, APNGWriter> {
 
-    private static final String TAG = APNGDecoder.class.getSimpleName();
+    private static final String TAG = Log.tag(APNGDecoder.class);
 
     private APNGWriter apngWriter;
     private int mLoopCount;

app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java

@@ -35,7 +35,7 @@ import java.util.Set;
  * @CreateDate: 2019/3/27
  */
 public abstract class FrameAnimationDrawable<Decoder extends FrameSeqDecoder> extends Drawable implements Animatable2Compat, FrameSeqDecoder.RenderListener {
-    private static final String TAG = FrameAnimationDrawable.class.getSimpleName();
+    private static final String TAG = Log.tag(FrameAnimationDrawable.class);
     private final Paint paint = new Paint();
     private final Decoder frameSeqDecoder;
     private DrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);

app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java

@@ -39,7 +39,7 @@ import java.util.concurrent.locks.LockSupport;
  * @CreateDate: 2019/3/27
  */
 public abstract class FrameSeqDecoder<R extends Reader, W extends Writer> {
-    private static final String TAG = FrameSeqDecoder.class.getSimpleName();
+    private static final String TAG = Log.tag(FrameSeqDecoder.class);
     private final int taskId;
 
     private final Loader mLoader;

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

@@ -54,6 +54,7 @@ public final class AppInitialization {
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
     SignalStore.onboarding().clearAll();
+    TextSecurePreferences.onPostBackupRestore(context);
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));

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

@@ -95,7 +95,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
 
-  private static final String TAG = ApplicationContext.class.getSimpleName();
+  private static final String TAG = Log.tag(ApplicationContext.class);
 
   private ExpiringMessageManager expiringMessageManager;
   private ViewOnceMessageManager viewOnceMessageManager;
@@ -126,6 +126,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("crash-handling", this::initializeCrashHandling)
                             .addBlocking("eat-db", () -> DatabaseFactory.getInstance(this))
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
+                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
                             .addBlocking("app-migrations", this::initializeApplicationMigrations)
                             .addBlocking("ring-rtc", this::initializeRingRtc)
@@ -144,6 +145,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                                 Conscrypt.setUseEngineSocketByDefault(true);
                               }
                             })
+                            .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializeGcmCheck)
                             .addNonBlocking(this::initializeSignedPreKeyCheck)
@@ -157,8 +159,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
                             .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
                             .addPostRender(this::initializeExpiringMessageManager)
-                            .addPostRender(this::initializeBlobProvider)
-                            .addPostRender(() -> NotificationChannels.create(this))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -387,7 +387,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeBlobProvider() {
-    BlobProvider.getInstance().onSessionStart(this);
+    BlobProvider.getInstance().initialize(this);
   }
 
   @WorkerThread

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

@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,8 +32,12 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.conversationlist.model.UnreadPayments;
+import org.thoughtcrime.securesms.conversationlist.model.UnreadPaymentsLiveData;
 import org.thoughtcrime.securesms.help.HelpFragment;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.payments.preferences.PaymentsActivity;
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
@@ -43,9 +48,9 @@ import org.thoughtcrime.securesms.preferences.DataAndStoragePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.EditProxyFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.widgets.PaymentsPreference;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
 import org.thoughtcrime.securesms.preferences.widgets.UsernamePreference;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.profiles.manage.ManageProfileActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.KeyCachingService;
@@ -66,12 +71,13 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener
 {
-  public static final String LAUNCH_TO_BACKUPS_FRAGMENT = "launch.to.backups.fragment";
-  public static final String LAUNCH_TO_HELP_FRAGMENT    = "launch.to.help.fragment";
-  public static final String LAUNCH_TO_PROXY_FRAGMENT   = "launch.to.proxy.fragment";
+  public static final String LAUNCH_TO_BACKUPS_FRAGMENT       = "launch.to.backups.fragment";
+  public static final String LAUNCH_TO_HELP_FRAGMENT          = "launch.to.help.fragment";
+  public static final String LAUNCH_TO_PROXY_FRAGMENT         = "launch.to.proxy.fragment";
+  public static final String LAUNCH_TO_NOTIFICATIONS_FRAGMENT = "launch.to.notifications.fragment";
 
   @SuppressWarnings("unused")
-  private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ApplicationPreferencesActivity.class);
 
   private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
   private static final String PREFERENCE_CATEGORY_USERNAME       = "preference_category_username";
@@ -85,6 +91,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
   private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
   private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
   private static final String PREFERENCE_CATEGORY_DONATE         = "preference_category_donate";
+  private static final String PREFERENCE_CATEGORY_PAYMENTS       = "preference_category_payments";
 
   private static final String WAS_CONFIGURATION_UPDATED          = "was_configuration_updated";
 
@@ -109,9 +116,14 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_BACKUPS_FRAGMENT, false)) {
       initFragment(android.R.id.content, new BackupsPreferenceFragment());
     } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_HELP_FRAGMENT, false)) {
-      initFragment(android.R.id.content, new HelpFragment());
+      Bundle bundle = new Bundle();
+      bundle.putInt(HelpFragment.START_CATEGORY_INDEX, getIntent().getIntExtra(HelpFragment.START_CATEGORY_INDEX, 0));
+
+      initFragment(android.R.id.content, new HelpFragment(), null, bundle);
     } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_PROXY_FRAGMENT, false)) {
       initFragment(android.R.id.content, EditProxyFragment.newInstance());
+    } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_NOTIFICATIONS_FRAGMENT, false)) {
+      initFragment(android.R.id.content, new NotificationsPreferenceFragment());
     } else if (icicle == null) {
       initFragment(android.R.id.content, new ApplicationPreferenceFragment());
     } else {
@@ -187,6 +199,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
 
   public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
 
+    private final UnreadPaymentsLiveData unreadPaymentsLiveData = new UnreadPaymentsLiveData();
+
     @Override
     public void onCreate(Bundle icicle) {
       super.onCreate(icicle);
@@ -216,9 +230,29 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
       this.findPreference(PREFERENCE_CATEGORY_DONATE)
           .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
 
+      Preference paymentsPreference = this.findPreference(PREFERENCE_CATEGORY_PAYMENTS);
+
+      if (SignalStore.paymentsValues().getPaymentsAvailability().showPaymentsMenu()) {
+        paymentsPreference.setVisible(true);
+        paymentsPreference.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PAYMENTS));
+      } else {
+        paymentsPreference.setVisible(false);
+      }
+
       tintIcons();
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+      super.onViewCreated(view, savedInstanceState);
+
+      if (SignalStore.paymentsValues().getPaymentsAvailability().showPaymentsMenu()) {
+        PaymentsPreference paymentsPreference = (PaymentsPreference) this.findPreference(PREFERENCE_CATEGORY_PAYMENTS);
+
+        unreadPaymentsLiveData.observe(getViewLifecycleOwner(), unreadPayments -> paymentsPreference.setUnreadCount(unreadPayments.transform(UnreadPayments::getUnreadCount).or(-1)));
+      }
+    }
+
     private void tintIcons() {
       if (Build.VERSION.SDK_INT >= 21) return;
 
@@ -332,6 +366,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
         case PREFERENCE_CATEGORY_DONATE:
           CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url));
           break;
+        case PREFERENCE_CATEGORY_PAYMENTS:
+          startActivity(new Intent(requireContext(), PaymentsActivity.class));
+          break;
         default:
           throw new AssertionError();
         }

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

@@ -67,6 +67,7 @@ public interface BindableConversationItem extends Unbindable {
     void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient);
     void onJoinGroupCallClicked();
     void onInviteFriendsToGroupClicked(@NonNull GroupId.V2 groupId);
+    void onEnableCallNotificationsClicked();
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

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

@@ -11,6 +11,8 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
@@ -27,17 +29,16 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.VerifySpan;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.io.IOException;
 
-import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
-
 public class ConfirmIdentityDialog extends AlertDialog {
 
   @SuppressWarnings("unused")
-  private static final String TAG = ConfirmIdentityDialog.class.getSimpleName();
+  private static final String TAG = Log.tag(ConfirmIdentityDialog.class);
 
   private OnClickListener callback;
 
@@ -94,7 +95,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
       {
         @Override
         protected Void doInBackground(Void... params) {
-          synchronized (SESSION_LOCK) {
+          try (SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
             SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
             TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
 
@@ -136,7 +137,6 @@ public class ConfirmIdentityDialog extends AlertDialog {
 
         private void processIncomingMessageRecord(MessageRecord messageRecord) {
           try {
-            PushDatabase    pushDatabase = DatabaseFactory.getPushDatabase(getContext());
             MessageDatabase smsDatabase  = DatabaseFactory.getSmsDatabase(getContext());
 
             smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
@@ -155,9 +155,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
                                                                        0,
                                                                        null);
 
-            long pushId = pushDatabase.insert(envelope);
-
-            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), envelope, messageRecord.getId()));
           } catch (IOException e) {
             throw new AssertionError(e);
           }

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

@@ -47,7 +47,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
                                                           ContactSelectionListFragment.OnContactSelectedListener,
                                                           ContactSelectionListFragment.ScrollCallback
 {
-  private static final String TAG = ContactSelectionActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactSelectionActivity.class);
 
   public static final String EXTRA_LAYOUT_RES_ID = "layout_res_id";
 

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

@@ -58,6 +58,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
 import org.thoughtcrime.securesms.components.emoji.WarningTextView;
+import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
@@ -114,22 +115,23 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public static final String CAN_SELECT_SELF   = "can_select_self";
   public static final String DISPLAY_CHIPS     = "display_chips";
 
-  private ConstraintLayout                constraintLayout;
-  private TextView                        emptyText;
-  private OnContactSelectedListener       onContactSelectedListener;
-  private SwipeRefreshLayout              swipeRefresh;
-  private View                            showContactsLayout;
-  private Button                          showContactsButton;
-  private TextView                        showContactsDescription;
-  private ProgressWheel                   showContactsProgress;
-  private String                          cursorFilter;
-  private RecyclerView                    recyclerView;
-  private RecyclerViewFastScroller        fastScroller;
-  private ContactSelectionListAdapter     cursorRecyclerViewAdapter;
-  private ChipGroup                       chipGroup;
-  private HorizontalScrollView            chipGroupScrollContainer;
-  private WarningTextView                 groupLimit;
-  private OnSelectionLimitReachedListener onSelectionLimitReachedListener;
+  private ConstraintLayout                            constraintLayout;
+  private TextView                                    emptyText;
+  private OnContactSelectedListener                   onContactSelectedListener;
+  private SwipeRefreshLayout                          swipeRefresh;
+  private View                                        showContactsLayout;
+  private Button                                      showContactsButton;
+  private TextView                                    showContactsDescription;
+  private ProgressWheel                               showContactsProgress;
+  private String                                      cursorFilter;
+  private RecyclerView                                recyclerView;
+  private RecyclerViewFastScroller                    fastScroller;
+  private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
+  private ChipGroup                                   chipGroup;
+  private HorizontalScrollView                        chipGroupScrollContainer;
+  private WarningTextView                             groupLimit;
+  private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
+  private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
 
 
   @Nullable private FixedViewsAdapter headerAdapter;
@@ -151,10 +153,18 @@ public final class ContactSelectionListFragment extends LoggingFragment
       listCallback = (ListCallback) context;
     }
 
+    if (getParentFragment() instanceof ScrollCallback) {
+      scrollCallback = (ScrollCallback) getParentFragment();
+    }
+
     if (context instanceof ScrollCallback) {
       scrollCallback = (ScrollCallback) context;
     }
 
+    if (getParentFragment() instanceof OnContactSelectedListener) {
+      onContactSelectedListener = (OnContactSelectedListener) getParentFragment();
+    }
+
     if (context instanceof OnContactSelectedListener) {
       onContactSelectedListener = (OnContactSelectedListener) context;
     }
@@ -162,6 +172,14 @@ public final class ContactSelectionListFragment extends LoggingFragment
     if (context instanceof OnSelectionLimitReachedListener) {
       onSelectionLimitReachedListener = (OnSelectionLimitReachedListener) context;
     }
+
+    if (context instanceof AbstractContactsCursorLoaderFactoryProvider) {
+      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) context;
+    }
+
+    if (getParentFragment() instanceof AbstractContactsCursorLoaderFactoryProvider) {
+      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) context;
+    }
   }
 
   @Override
@@ -190,7 +208,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
                  activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 
-                 if (activity.getIntent().getBooleanExtra(RECENTS, false)) {
+                 if (safeArguments().getBoolean(RECENTS, activity.getIntent().getBooleanExtra(RECENTS, false))) {
                    LoaderManager.getInstance(this).initLoader(0, null, ContactSelectionListFragment.this);
                  } else {
                    initializeNoContactsPermission();
@@ -224,14 +242,18 @@ public final class ContactSelectionListFragment extends LoggingFragment
       }
     });
 
-    Intent intent = requireActivity().getIntent();
+    Intent intent    = requireActivity().getIntent();
+    Bundle arguments = safeArguments();
 
-    swipeRefresh.setEnabled(intent.getBooleanExtra(REFRESHABLE, true));
+    swipeRefresh.setEnabled(arguments.getBoolean(REFRESHABLE, intent.getBooleanExtra(REFRESHABLE, true)));
 
-    hideCount      = intent.getBooleanExtra(HIDE_COUNT, false);
-    selectionLimit = intent.getParcelableExtra(SELECTION_LIMITS);
-    isMulti        = selectionLimit != null;
-    canSelectSelf  = intent.getBooleanExtra(CAN_SELECT_SELF, !isMulti);
+    hideCount      = arguments.getBoolean(HIDE_COUNT, intent.getBooleanExtra(HIDE_COUNT, false));
+    selectionLimit = arguments.getParcelable(SELECTION_LIMITS);
+    if (selectionLimit == null) {
+      selectionLimit = intent.getParcelableExtra(SELECTION_LIMITS);
+    }
+    isMulti       = selectionLimit != null;
+    canSelectSelf = arguments.getBoolean(CAN_SELECT_SELF, intent.getBooleanExtra(CAN_SELECT_SELF, !isMulti));
 
     if (!isMulti) {
       selectionLimit = SelectionLimits.NO_LIMITS;
@@ -244,6 +266,10 @@ public final class ContactSelectionListFragment extends LoggingFragment
     return view;
   }
 
+  private @NonNull Bundle safeArguments() {
+    return getArguments() != null ? getArguments() : new Bundle();
+  }
+
   private void updateGroupLimit(int chipCount) {
     int members = currentSelection.size() + chipCount;
     groupLimit.setText(getResources().getQuantityString(R.plurals.ContactSelectionListFragment_d_members, members, members));
@@ -273,7 +299,10 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private Set<RecipientId> getCurrentSelection() {
-    List<RecipientId> currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);
+    List<RecipientId> currentSelection = safeArguments().getParcelableArrayList(CURRENT_SELECTION);
+    if (currentSelection == null) {
+      currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);
+    }
 
     return currentSelection == null ? Collections.emptySet()
                                     : Collections.unmodifiableSet(Stream.of(currentSelection).collect(Collectors.toSet()));
@@ -387,10 +416,15 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
   @Override
   public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    FragmentActivity activity = requireActivity();
-    return new ContactsCursorLoader(activity,
-                                    activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
-                                    cursorFilter, activity.getIntent().getBooleanExtra(RECENTS, false));
+    FragmentActivity activity       = requireActivity();
+    int              displayMode    = safeArguments().getInt(DISPLAY_MODE, activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL));
+    boolean          displayRecents = safeArguments().getBoolean(RECENTS, activity.getIntent().getBooleanExtra(RECENTS, false));
+
+    if (cursorFactoryProvider != null) {
+      return cursorFactoryProvider.get().create();
+    } else {
+      return new ContactsCursorLoader.Factory(activity, displayMode, cursorFilter, displayRecents).create();
+    }
   }
 
   @Override
@@ -656,7 +690,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void setChipGroupVisibility(int visibility) {
-    if (!requireActivity().getIntent().getBooleanExtra(DISPLAY_CHIPS, true)) {
+    if (!safeArguments().getBoolean(DISPLAY_CHIPS, requireActivity().getIntent().getBooleanExtra(DISPLAY_CHIPS, true))) {
       return;
     }
 
@@ -696,4 +730,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public interface ScrollCallback {
     void onBeginScroll();
   }
+
+  public interface AbstractContactsCursorLoaderFactoryProvider {
+    @NonNull AbstractContactsCursorLoader.Factory get();
+  }
 }

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

@@ -18,6 +18,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
@@ -28,7 +29,6 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
@@ -45,7 +45,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
     implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {
 
-  private static final String TAG = DeviceActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceActivity.class);
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@@ -123,7 +123,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
 
   @Override
   public void onQrDataFound(final String data) {
-    Util.runOnMain(() -> {
+    ThreadUtil.runOnMain(() -> {
       ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
       Uri uri = Uri.parse(data);
       deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);

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

@@ -40,7 +40,7 @@ public class DeviceListFragment extends ListFragment
                ListView.OnItemClickListener, Button.OnClickListener
 {
 
-  private static final String TAG = DeviceListFragment.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceListFragment.class);
 
   private SignalServiceAccountManager accountManager;
   private Locale                      locale;

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

@@ -6,10 +6,12 @@ import android.view.Window;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
+
 public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")
-  private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceProvisioningActivity.class);
 
   @Override
   protected void onPreCreate() {

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

@@ -7,6 +7,8 @@ import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -40,6 +42,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.text.AfterTextChanged;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.concurrent.ExecutionException;
@@ -105,6 +108,14 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     contactsFragment  = (ContactSelectionListFragment)getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
 
     inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
+    inviteText.addTextChangedListener(new AfterTextChanged(editable -> {
+      boolean isEnabled = editable.length() > 0;
+      smsButton.setEnabled(isEnabled);
+      shareButton.setEnabled(isEnabled);
+      smsButton.animate().alpha(isEnabled ? 1f : 0.5f);
+      shareButton.animate().alpha(isEnabled ? 1f : 0.5f);
+    }));
+
     updateSmsButtonText(contactsFragment.getSelectedContacts().size());
 
     smsCancelButton.setOnClickListener(new SmsCancelClickListener());

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
 
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -15,6 +16,12 @@ public abstract class LoggingFragment extends Fragment {
 
   private static final String TAG = Log.tag(LoggingFragment.class);
 
+  public LoggingFragment() { }
+
+  public LoggingFragment(@LayoutRes int contentLayoutId) {
+    super(contentLayoutId);
+  }
+
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     logEvent("onCreate()");

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

@@ -9,6 +9,8 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.CommunicationActions;
@@ -70,6 +72,9 @@ public class MainActivity extends PassphraseRequiredActivity {
   protected void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
+    if (SignalStore.misc().isOldDeviceTransferLocked()) {
+      OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
+    }
   }
 
   @Override

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

@@ -91,7 +91,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
              MediaPreviewFragment.Events
 {
 
-  private final static String TAG = MediaPreviewActivity.class.getSimpleName();
+  private final static String TAG = Log.tag(MediaPreviewActivity.class);
 
   private static final int NOT_IN_A_THREAD = -2;
 

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

@@ -38,10 +38,10 @@ public class MuteDialog extends AlertDialog {
 
         switch (which) {
           case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
-          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2);  break;
+          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(8);  break;
           case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
           case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
-          case 4:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365); break;
+          case 4:  muteUntil = Long.MAX_VALUE;                                           break;
           default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
         }
 

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

@@ -49,7 +49,7 @@ public class NewConversationActivity extends ContactSelectionActivity
 {
 
   @SuppressWarnings("unused")
-  private static final String TAG = NewConversationActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(NewConversationActivity.class);
 
   @Override
   public void onCreate(Bundle bundle, boolean ready) {

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

@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
  */
 public abstract class PassphraseActivity extends BaseActivity {
 
-  private static final String TAG = PassphraseActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(PassphraseActivity.class);
 
   private KeyCachingService keyCachingService;
   private MasterSecret masterSecret;

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

@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms;
 
 import android.animation.Animator;
-import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -46,9 +45,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
-import androidx.core.os.CancellationSignal;
+import androidx.biometric.BiometricManager;
+import androidx.biometric.BiometricManager.Authenticators;
+import androidx.biometric.BiometricPrompt;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
@@ -70,7 +71,12 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
  */
 public class PassphrasePromptActivity extends PassphraseActivity {
 
-  private static final String TAG = PassphrasePromptActivity.class.getSimpleName();
+  private static final String TAG                       = Log.tag(PassphrasePromptActivity.class);
+  private static final int    BIOMETRIC_AUTHENTICATORS  = Authenticators.BIOMETRIC_STRONG | Authenticators.BIOMETRIC_WEAK;
+  private static final int    ALLOWED_AUTHENTICATORS    = BIOMETRIC_AUTHENTICATORS | Authenticators.DEVICE_CREDENTIAL;
+  private static final short  AUTHENTICATE_REQUEST_CODE = 1007;
+  private static final String BUNDLE_ALREADY_SHOWN      = "bundle_already_shown";
+  public static final  String FROM_FOREGROUND           = "from_foreground";
 
   private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
   private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
@@ -84,12 +90,13 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private ImageButton     hideButton;
   private AnimatingToggle visibilityToggle;
 
-  private FingerprintManagerCompat fingerprintManager;
-  private CancellationSignal       fingerprintCancellationSignal;
-  private FingerprintListener      fingerprintListener;
+  private BiometricManager           biometricManager;
+  private BiometricPrompt            biometricPrompt;
+  private BiometricPrompt.PromptInfo biometricPromptInfo;
 
   private boolean authenticated;
-  private boolean failure;
+  private boolean hadFailure;
+  private boolean alreadyShown;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -102,6 +109,15 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
     setContentView(R.layout.prompt_passphrase_activity);
     initializeResources();
+
+    alreadyShown = (savedInstanceState != null && savedInstanceState.getBoolean(BUNDLE_ALREADY_SHOWN)) ||
+                   getIntent().getBooleanExtra(FROM_FOREGROUND, false);
+  }
+
+  @Override
+  protected void onSaveInstanceState(@NonNull Bundle outState) {
+    super.onSaveInstanceState(outState);
+    outState.putBoolean(BUNDLE_ALREADY_SHOWN, alreadyShown);
   }
 
   @Override
@@ -112,20 +128,12 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
     setLockTypeVisibility();
 
-    if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated && !failure) {
-      resumeScreenLock();
+    if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated && !hadFailure) {
+      resumeScreenLock(!alreadyShown);
+      alreadyShown = true;
     }
 
-    failure = false;
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-
-    if (TextSecurePreferences.isScreenLockEnabled(this)) {
-      pauseScreenLock();
-    }
+    hadFailure = false;
   }
 
   @Override
@@ -160,15 +168,16 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   }
 
   @Override
-  @SuppressLint("MissingSuperCall") // no fragments to dispatch to
-  public void onActivityResult(int requestCode, int resultcode, Intent data) {
-    if (requestCode != 1) return;
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
 
-    if (resultcode == RESULT_OK) {
+    if (requestCode != AUTHENTICATE_REQUEST_CODE) return;
+
+    if (resultCode == RESULT_OK) {
       handleAuthenticated();
     } else {
       Log.w(TAG, "Authentication failed");
-      failure = true;
+      hadFailure = true;
     }
   }
 
@@ -219,16 +228,20 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     ImageButton okButton = findViewById(R.id.ok_button);
     Toolbar     toolbar  = findViewById(R.id.toolbar);
 
-    showButton                    = findViewById(R.id.passphrase_visibility);
-    hideButton                    = findViewById(R.id.passphrase_visibility_off);
-    visibilityToggle              = findViewById(R.id.button_toggle);
-    passphraseText                = findViewById(R.id.passphrase_edit);
-    passphraseAuthContainer       = findViewById(R.id.password_auth_container);
-    fingerprintPrompt             = findViewById(R.id.fingerprint_auth_container);
-    lockScreenButton              = findViewById(R.id.lock_screen_auth_container);
-    fingerprintManager            = FingerprintManagerCompat.from(this);
-    fingerprintCancellationSignal = new CancellationSignal();
-    fingerprintListener           = new FingerprintListener();
+    showButton              = findViewById(R.id.passphrase_visibility);
+    hideButton              = findViewById(R.id.passphrase_visibility_off);
+    visibilityToggle        = findViewById(R.id.button_toggle);
+    passphraseText          = findViewById(R.id.passphrase_edit);
+    passphraseAuthContainer = findViewById(R.id.password_auth_container);
+    fingerprintPrompt       = findViewById(R.id.fingerprint_auth_container);
+    lockScreenButton        = findViewById(R.id.lock_screen_auth_container);
+    biometricManager        = BiometricManager.from(this);
+    biometricPrompt         = new BiometricPrompt(this, new BiometricAuthenticationListener());
+    biometricPromptInfo     = new BiometricPrompt.PromptInfo
+                                                 .Builder()
+                                                 .setAllowedAuthenticators(ALLOWED_AUTHENTICATORS)
+                                                 .setTitle(getString(R.string.PassphrasePromptActivity_unlock_signal))
+                                                 .build();
 
     setSupportActionBar(toolbar);
     getSupportActionBar().setTitle("");
@@ -248,20 +261,15 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
     fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);
 
-    lockScreenButton.setOnClickListener(v -> resumeScreenLock());
+    lockScreenButton.setOnClickListener(v -> resumeScreenLock(true));
   }
 
   private void setLockTypeVisibility() {
     if (TextSecurePreferences.isScreenLockEnabled(this)) {
       passphraseAuthContainer.setVisibility(View.GONE);
-
-      if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
-        fingerprintPrompt.setVisibility(View.VISIBLE);
-        lockScreenButton.setVisibility(View.GONE);
-      } else {
-        fingerprintPrompt.setVisibility(View.GONE);
-        lockScreenButton.setVisibility(View.VISIBLE);
-      }
+      fingerprintPrompt.setVisibility(biometricManager.canAuthenticate(BIOMETRIC_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS ? View.VISIBLE
+                                                                                                                                       : View.GONE);
+      lockScreenButton.setVisibility(View.VISIBLE);
     } else {
       passphraseAuthContainer.setVisibility(View.VISIBLE);
       fingerprintPrompt.setVisibility(View.GONE);
@@ -269,7 +277,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     }
   }
 
-  private void resumeScreenLock() {
+  private void resumeScreenLock(boolean force) {
     KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
 
     assert keyguardManager != null;
@@ -280,26 +288,27 @@ public class PassphrasePromptActivity extends PassphraseActivity {
       return;
     }
 
-    if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
-      Log.i(TAG, "Listening for fingerprints...");
-      fingerprintCancellationSignal = new CancellationSignal();
-      fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
-    } else if (Build.VERSION.SDK_INT >= 21){
-      Log.i(TAG, "firing intent...");
-      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
-      startActivityForResult(intent, 1);
+    if (Build.VERSION.SDK_INT != 29 && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
+      if (force) {
+        Log.i(TAG, "Listening for biometric authentication...");
+        biometricPrompt.authenticate(biometricPromptInfo);
+      } else {
+        Log.i(TAG, "Skipping show system biometric dialog unless forced");
+      }
+    } else if (Build.VERSION.SDK_INT >= 21) {
+      if (force) {
+        Log.i(TAG, "firing intent...");
+        Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
+        startActivityForResult(intent, AUTHENTICATE_REQUEST_CODE);
+      } else {
+        Log.i(TAG, "Skipping firing intent unless forced");
+      }
     } else {
       Log.w(TAG, "Not compatible...");
       handleAuthenticated();
     }
   }
 
-  private void pauseScreenLock() {
-    if (fingerprintCancellationSignal != null) {
-      fingerprintCancellationSignal.cancel();
-    }
-  }
-
   private void sendEmailToSupport() {
     String body = SupportEmailUtil.generateSupportEmailBody(this,
                                                             R.string.PassphrasePromptActivity_signal_android_lock_screen,
@@ -359,15 +368,19 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     System.gc();
   }
 
-  private class FingerprintListener extends FingerprintManagerCompat.AuthenticationCallback {
+  private class BiometricAuthenticationListener extends BiometricPrompt.AuthenticationCallback {
     @Override
-    public void onAuthenticationError(int errMsgId, CharSequence errString) {
-      Log.w(TAG, "Authentication error: " + errMsgId + " " + errString);
-      onAuthenticationFailed();
+    public void onAuthenticationError(int errorCode, @NonNull CharSequence errorString) {
+      Log.w(TAG, "Authentication error: " + errorCode);
+      hadFailure = true;
+
+      if (errorCode != BiometricPrompt.ERROR_CANCELED && errorCode != BiometricPrompt.ERROR_USER_CANCELED) {
+        onAuthenticationFailed();
+      }
     }
 
     @Override
-    public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) {
+    public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
       Log.i(TAG, "onAuthenticationSucceeded");
       fingerprintPrompt.setImageResource(R.drawable.ic_check_white_48dp);
       fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.SRC_IN);
@@ -384,8 +397,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
     @Override
     public void onAuthenticationFailed() {
-      Log.w(TAG, "onAuthenticatoinFailed()");
-      FingerprintManagerCompat.AuthenticationCallback callback = this;
+      Log.w(TAG, "onAuthenticationFailed()");
 
       fingerprintPrompt.setImageResource(R.drawable.ic_close_white_48dp);
       fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.SRC_IN);
@@ -409,6 +421,5 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
       fingerprintPrompt.startAnimation(shake);
     }
-
   }
 }

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

@@ -11,10 +11,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
+import org.signal.devicetransfer.TransferStatus;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
@@ -32,7 +35,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import java.util.Locale;
 
 public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(PassphraseRequiredActivity.class);
 
   public static final String LOCALE_EXTRA      = "locale_extra";
   public static final String NEXT_INTENT_EXTRA = "next_intent";
@@ -45,6 +48,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   private static final int STATE_ENTER_SIGNAL_PIN    = 5;
   private static final int STATE_CREATE_PROFILE_NAME = 6;
   private static final int STATE_CREATE_SIGNAL_PIN   = 7;
+  private static final int STATE_TRANSFER_ONGOING    = 8;
+  private static final int STATE_TRANSFER_LOCKED     = 9;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
@@ -146,6 +151,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       case STATE_ENTER_SIGNAL_PIN:    return getEnterSignalPinIntent();
       case STATE_CREATE_SIGNAL_PIN:   return getCreateSignalPinIntent();
       case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
+      case STATE_TRANSFER_ONGOING:    return getOldDeviceTransferIntent();
+      case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
       default:                        return null;
     }
   }
@@ -165,6 +172,10 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       return STATE_CREATE_PROFILE_NAME;
     } else if (userMustCreateSignalPin()) {
       return STATE_CREATE_SIGNAL_PIN;
+    } else if (EventBus.getDefault().getStickyEvent(TransferStatus.class) != null && getClass() != OldDeviceTransferActivity.class) {
+      return STATE_TRANSFER_ONGOING;
+    } else if (SignalStore.misc().isOldDeviceTransferLocked()) {
+      return STATE_TRANSFER_LOCKED;
     } else {
       return STATE_NORMAL;
     }
@@ -183,7 +194,9 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getPromptPassphraseIntent() {
-    return getRoutedIntent(PassphrasePromptActivity.class, getIntent());
+    Intent intent = getRoutedIntent(PassphrasePromptActivity.class, getIntent());
+    intent.putExtra(PassphrasePromptActivity.FROM_FOREGROUND, ApplicationDependencies.getAppForegroundObserver().isForegrounded());
+    return intent;
   }
 
   private Intent getUiBlockingUpgradeIntent() {
@@ -217,6 +230,19 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     return getRoutedIntent(EditProfileActivity.class, getIntent());
   }
 
+  private Intent getOldDeviceTransferIntent() {
+    Intent intent = new Intent(this, OldDeviceTransferActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+    return intent;
+  }
+
+  private @Nullable Intent getOldDeviceTransferLockedIntent() {
+    if (getClass() == MainActivity.class) {
+      return null;
+    }
+    return MainActivity.clearTop(this);
+  }
+
   private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
     final Intent intent = new Intent(this, destination);
     if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);

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

@@ -21,6 +21,7 @@ import android.os.Bundle;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -38,7 +39,7 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
   public static final String KEY_SELECTED_RECIPIENTS = "recipients";
 
   @SuppressWarnings("unused")
-  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
+  private final static String TAG = Log.tag(PushContactSelectionActivity.class);
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {

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

@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
 
 public class SmsSendtoActivity extends Activity {
 
-  private static final String TAG = SmsSendtoActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(SmsSendtoActivity.class);
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

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

@@ -6,6 +6,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.CharacterCalculator;
 import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
@@ -25,7 +26,7 @@ import static org.thoughtcrime.securesms.TransportOption.Type;
 
 public class TransportOptions {
 
-  private static final String TAG = TransportOptions.class.getSimpleName();
+  private static final String TAG = Log.tag(TransportOptions.class);
 
   private final List<OnTransportChangedListener> listeners = new LinkedList<>();
   private final Context                          context;

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

@@ -60,9 +60,12 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
+import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.components.camera.CameraView;
+import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -78,7 +81,6 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.DynamicDarkActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -91,14 +93,13 @@ import org.whispersystems.libsignal.fingerprint.Fingerprint;
 import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
 import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
 import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
+import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Locale;
 
-import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
-
 /**
  * Activity for verifying identity keys.
  *
@@ -185,7 +186,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
 
   @Override
   public void onQrDataFound(final String data) {
-    Util.runOnMain(() -> {
+    ThreadUtil.runOnMain(() -> {
       ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
 
       getSupportFragmentManager().popBackStack();
@@ -301,6 +302,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
       byte[] localId;
       byte[] remoteId;
 
+      //noinspection WrongThread
       Recipient resolved = recipient.resolve();
 
       if (FeatureFlags.verifyV2() && resolved.getUuid().isPresent()) {
@@ -617,36 +619,35 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, final boolean isChecked) {
-      new AsyncTask<Recipient, Void, Void>() {
-        @Override
-        protected Void doInBackground(Recipient... params) {
-          synchronized (SESSION_LOCK) {
-            if (isChecked) {
-              Log.i(TAG, "Saving identity: " + params[0].getId());
-              DatabaseFactory.getIdentityDatabase(getActivity())
-                             .saveIdentity(params[0].getId(),
-                                           remoteIdentity,
-                                           VerifiedStatus.VERIFIED, false,
-                                           System.currentTimeMillis(), true);
-            } else {
-              DatabaseFactory.getIdentityDatabase(getActivity())
-                             .setVerified(params[0].getId(),
-                                          remoteIdentity,
-                                          VerifiedStatus.DEFAULT);
-            }
+      final Recipient   recipient   = this.recipient.get();
+      final RecipientId recipientId = recipient.getId();
 
-            ApplicationDependencies.getJobManager()
-                                   .add(new MultiDeviceVerifiedUpdateJob(recipient.getId(),
-                                                                         remoteIdentity,
-                                                                         isChecked ? VerifiedStatus.VERIFIED :
-                                                                                     VerifiedStatus.DEFAULT));
-            StorageSyncHelper.scheduleSyncForDataChange();
-
-            IdentityUtil.markIdentityVerified(getActivity(), recipient.get(), isChecked, false);
+      SignalExecutors.BOUNDED.execute(() -> {
+        try (SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+          if (isChecked) {
+            Log.i(TAG, "Saving identity: " + recipientId);
+            DatabaseFactory.getIdentityDatabase(getActivity())
+                           .saveIdentity(recipientId,
+                                         remoteIdentity,
+                                         VerifiedStatus.VERIFIED, false,
+                                         System.currentTimeMillis(), true);
+          } else {
+            DatabaseFactory.getIdentityDatabase(getActivity())
+                           .setVerified(recipientId,
+                                        remoteIdentity,
+                                        VerifiedStatus.DEFAULT);
           }
-          return null;
+
+          ApplicationDependencies.getJobManager()
+                                 .add(new MultiDeviceVerifiedUpdateJob(recipientId,
+                                                                       remoteIdentity,
+                                                                       isChecked ? VerifiedStatus.VERIFIED
+                                                                                 : VerifiedStatus.DEFAULT));
+          StorageSyncHelper.scheduleSyncForDataChange();
+
+          IdentityUtil.markIdentityVerified(getActivity(), recipient, isChecked, false);
         }
-      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recipient.get());
+      });
     }
   }
 

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

@@ -41,22 +41,22 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
-import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.ringrtc.RemotePeer;
-import org.thoughtcrime.securesms.service.WebRtcCallService;
+import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
@@ -64,7 +64,6 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
-import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 
 import java.util.List;
 
@@ -141,7 +140,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     Log.i(TAG, "onPause");
     super.onPause();
 
-    if (!isInPipMode()) {
+    if (!isInPipMode() || isFinishing()) {
       EventBus.getDefault().unregister(this);
     }
 
@@ -158,18 +157,24 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     Log.i(TAG, "onStop");
     super.onStop();
 
-    EventBus.getDefault().unregister(this);
+    if (!isInPipMode() || isFinishing()) {
+      EventBus.getDefault().unregister(this);
+    }
 
     if (!viewModel.isCallStarting()) {
       CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
       if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
-        Intent intent = new Intent(this, WebRtcCallService.class);
-        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
-        startService(intent);
+        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
       }
     }
   }
 
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    EventBus.getDefault().unregister(this);
+  }
+
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
@@ -258,19 +263,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
       if (state != null) {
         if (state.needsNewRequestSizes()) {
-          Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-          intent.setAction(WebRtcCallService.ACTION_GROUP_UPDATE_RENDERED_RESOLUTIONS);
-          startService(intent);
+          ApplicationDependencies.getSignalCallManager().updateRenderedResolutions();
         }
       }
     });
 
     viewModel.getOrientation().observe(this, orientation -> {
-      Intent intent = new Intent(this, WebRtcCallService.class);
-      intent.setAction(WebRtcCallService.ACTION_ORIENTATION_CHANGED)
-            .putExtra(WebRtcCallService.EXTRA_ORIENTATION_DEGREES, orientation.getDegrees());
-
-      startService(intent);
+      ApplicationDependencies.getSignalCallManager().orientationChanged(orientation.getDegrees());
 
       switch (orientation) {
         case LANDSCAPE_LEFT_EDGE:
@@ -329,30 +328,19 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void handleSetAudioHandset() {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(false);
   }
 
   private void handleSetAudioSpeaker() {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
-    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, true);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(true);
   }
 
   private void handleSetAudioBluetooth() {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
-    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, true);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().setAudioBluetooth(true);
   }
 
   private void handleSetMuteAudio(boolean enabled) {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_AUDIO);
-    intent.putExtra(WebRtcCallService.EXTRA_MUTE, enabled);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().setMuteAudio(enabled);
   }
 
   private void handleSetMuteVideo(boolean muted) {
@@ -366,20 +354,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                  .ifNecessary()
                  .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
-                 .onAllGranted(() -> {
-                   Intent intent = new Intent(this, WebRtcCallService.class);
-                   intent.setAction(WebRtcCallService.ACTION_SET_ENABLE_VIDEO);
-                   intent.putExtra(WebRtcCallService.EXTRA_ENABLE, !muted);
-                   startService(intent);
-                 })
+                 .onAllGranted(() -> ApplicationDependencies.getSignalCallManager().setMuteVideo(!muted))
                  .execute();
     }
   }
 
   private void handleFlipCamera() {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_FLIP_CAMERA);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().flipCamera();
   }
 
   private void handleAnswerWithAudio() {
@@ -396,9 +377,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                    callScreen.setRecipient(recipient);
                    callScreen.setStatus(getString(R.string.RedPhone_answering));
 
-                   Intent intent = new Intent(this, WebRtcCallService.class);
-                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
-                   startService(intent);
+                   ApplicationDependencies.getSignalCallManager().acceptCall(false);
                  })
                  .onAnyDenied(this::handleDenyCall)
                  .execute();
@@ -419,10 +398,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                    callScreen.setRecipient(recipient);
                    callScreen.setStatus(getString(R.string.RedPhone_answering));
 
-                   Intent intent = new Intent(this, WebRtcCallService.class);
-                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
-                   intent.putExtra(WebRtcCallService.EXTRA_ANSWER_WITH_VIDEO, true);
-                   startService(intent);
+                   ApplicationDependencies.getSignalCallManager().acceptCall(true);
 
                    handleSetMuteVideo(false);
                  })
@@ -435,9 +411,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     Recipient recipient = viewModel.getRecipient().get();
 
     if (!recipient.equals(Recipient.UNKNOWN)) {
-      Intent intent = new Intent(this, WebRtcCallService.class);
-      intent.setAction(WebRtcCallService.ACTION_DENY_CALL);
-      startService(intent);
+      ApplicationDependencies.getSignalCallManager().denyCall();
 
       callScreen.setRecipient(recipient);
       callScreen.setStatus(getString(R.string.RedPhone_ending_call));
@@ -447,9 +421,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private void handleEndCall() {
     Log.i(TAG, "Hangup pressed, handling termination now...");
-    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP);
-    startService(intent);
+    ApplicationDependencies.getSignalCallManager().localHangup();
   }
 
   private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
@@ -480,7 +452,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private void handleCallBusy() {
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
     callScreen.setStatus(getString(R.string.RedPhone_busy));
-    delayedFinish(WebRtcCallService.BUSY_TONE_LENGTH);
+    delayedFinish(SignalCallManager.BUSY_TONE_LENGTH);
   }
 
   private void handleCallConnected(@NonNull WebRtcViewModel event) {
@@ -518,6 +490,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     final Recipient   recipient = event.getRemoteParticipants().get(0).getRecipient();
 
     if (theirKey == null) {
+      Log.w(TAG, "Untrusted identity without an identity key, terminating call.");
       handleTerminate(recipient, HangupMessage.Type.NORMAL);
     }
 
@@ -536,7 +509,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void updateGroupMembersForGroupCall() {
-    startService(new Intent(this, WebRtcCallService.class).setAction(WebRtcCallService.ACTION_GROUP_REQUEST_UPDATE_MEMBERS));
+    ApplicationDependencies.getSignalCallManager().requestUpdateGroupMembers();
   }
 
   private void updateSpeakerHint(boolean showSpeakerHint) {
@@ -550,11 +523,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   @Override
   public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> changedRecipients) {
     CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+
+    if (state == null) {
+      return;
+    }
+
     if (state.getGroupCallState().isConnected()) {
-      Intent intent = new Intent(this, WebRtcCallService.class);
-      intent.setAction(WebRtcCallService.ACTION_GROUP_APPROVE_SAFETY_CHANGE)
-            .putExtra(WebRtcCallService.EXTRA_RECIPIENT_IDS, RecipientId.toSerializedList(changedRecipients));
-      startService(intent);
+      ApplicationDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
     } else {
       viewModel.startCall(state.getLocalParticipant().isVideoEnabled());
     }
@@ -568,9 +543,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
     if (state != null && state.getGroupCallState().isNotIdle()) {
       if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
-        Intent intent = new Intent(this, WebRtcCallService.class);
-        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
-        startService(intent);
+        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
         finish();
       } else {
         handleEndCall();
@@ -636,11 +609,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private void startCall(boolean isVideoCall) {
     enableVideoIfAvailable = isVideoCall;
 
-    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
-          .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(viewModel.getRecipient().getId()))
-          .putExtra(WebRtcCallService.EXTRA_OFFER_TYPE, (isVideoCall ? OfferMessage.Type.VIDEO_CALL : OfferMessage.Type.AUDIO_CALL).getCode());
-    startService(intent);
+    if (isVideoCall) {
+      ApplicationDependencies.getSignalCallManager().startOutgoingVideoCall(viewModel.getRecipient().get());
+    } else {
+      ApplicationDependencies.getSignalCallManager().startOutgoingAudioCall(viewModel.getRecipient().get());
+    }
 
     MessageSender.onMessageSent();
   }

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

@@ -108,6 +108,8 @@ public abstract class Attachment {
   @Nullable
   public abstract Uri getUri();
 
+  public abstract @Nullable Uri getPublicUri();
+
   public int getTransferState() {
     return transferState;
   }

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

@@ -65,6 +65,15 @@ public class DatabaseAttachment extends Attachment {
     }
   }
 
+  @Override
+  public @Nullable Uri getPublicUri() {
+    if (hasData) {
+      return PartAuthority.getAttachmentPublicUri(getUri());
+    } else {
+      return null;
+    }
+  }
+
   public AttachmentId getAttachmentId() {
     return attachmentId;
   }

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

@@ -20,6 +20,11 @@ public class MmsNotificationAttachment extends Attachment {
     return null;
   }
 
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
   private static int getTransferStateFromStatus(int status) {
     if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED ||
         status == MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY)

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

@@ -46,6 +46,11 @@ public class PointerAttachment extends Attachment {
     return null;
   }
 
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
   public static List<Attachment> forPointers(Optional<List<SignalServiceAttachment>> pointers) {
     List<Attachment> results = new LinkedList<>();
 

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

@@ -23,4 +23,9 @@ public class TombstoneAttachment extends Attachment {
   public @Nullable Uri getUri() {
     return null;
   }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
 }

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

@@ -58,6 +58,11 @@ public class UriAttachment extends Attachment {
     return dataUri;
   }
 
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
   @Override
   public boolean equals(Object other) {
     return other != null && other instanceof UriAttachment && ((UriAttachment) other).dataUri.equals(this.dataUri);

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

@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioCodec {
 
-  private static final String TAG = AudioCodec.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioCodec.class);
 
   private static final int    SAMPLE_RATE       = 44100;
   private static final int    SAMPLE_RATE_INDEX = 4;

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

@@ -8,11 +8,11 @@ import android.os.ParcelFileDescriptor;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libsignal.util.Pair;
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioRecorder {
 
-  private static final String TAG = AudioRecorder.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioRecorder.class);
 
   private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder");
 
@@ -90,10 +90,10 @@ public class AudioRecorder {
   }
 
   private <T> void sendToFuture(final SettableFuture<T> future, final Exception exception) {
-    Util.runOnMain(() -> future.setException(exception));
+    ThreadUtil.runOnMain(() -> future.setException(exception));
   }
 
   private <T> void sendToFuture(final SettableFuture<T> future, final T result) {
-    Util.runOnMain(() -> future.set(result));
+    ThreadUtil.runOnMain(() -> future.set(result));
   }
 }

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

@@ -16,6 +16,7 @@ import androidx.core.util.Consumer;
 
 import com.google.protobuf.ByteString;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormDat
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
 import org.thoughtcrime.securesms.media.MediaInput;
 import org.thoughtcrime.securesms.mms.AudioSlide;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
 
 import java.io.IOException;
@@ -61,13 +61,13 @@ public final class AudioWaveForm {
 
     if (uri == null) {
       Log.w(TAG, "No uri");
-      Util.runOnMain(onFailure);
+      ThreadUtil.runOnMain(onFailure);
       return;
     }
 
     if (!(attachment instanceof DatabaseAttachment)) {
       Log.i(TAG, "Not yet in database");
-      Util.runOnMain(onFailure);
+      ThreadUtil.runOnMain(onFailure);
       return;
     }
 
@@ -75,7 +75,7 @@ public final class AudioWaveForm {
     AudioFileInfo cached   = WAVE_FORM_CACHE.get(cacheKey);
     if (cached != null) {
       Log.i(TAG, "Loaded wave form from cache " + cacheKey);
-      Util.runOnMain(() -> onSuccess.accept(cached));
+      ThreadUtil.runOnMain(() -> onSuccess.accept(cached));
       return;
     }
 
@@ -83,7 +83,7 @@ public final class AudioWaveForm {
       AudioFileInfo cachedInExecutor = WAVE_FORM_CACHE.get(cacheKey);
       if (cachedInExecutor != null) {
         Log.i(TAG, "Loaded wave form from cache inside executor" + cacheKey);
-        Util.runOnMain(() -> onSuccess.accept(cachedInExecutor));
+        ThreadUtil.runOnMain(() -> onSuccess.accept(cachedInExecutor));
         return;
       }
 
@@ -92,14 +92,14 @@ public final class AudioWaveForm {
         AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
         if (audioFileInfo.waveForm.length == 0) {
           Log.w(TAG, "Recovering from a wave form generation error  " + cacheKey);
-          Util.runOnMain(onFailure);
+          ThreadUtil.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);
           Log.i(TAG, "Loaded wave form from DB " + cacheKey);
-          Util.runOnMain(() -> onSuccess.accept(audioFileInfo));
+          ThreadUtil.runOnMain(() -> onSuccess.accept(audioFileInfo));
           return;
         }
       }
@@ -120,10 +120,10 @@ public final class AudioWaveForm {
         attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
 
         WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-        Util.runOnMain(() -> onSuccess.accept(fileInfo));
+        ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
       } catch (Throwable e) {
         Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-        Util.runOnMain(onFailure);
+        ThreadUtil.runOnMain(onFailure);
       }
     });
   }

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

@@ -18,7 +18,7 @@ public final class BackupPassphrase {
   private BackupPassphrase() {
   }
 
-  private static final String TAG = BackupPassphrase.class.getSimpleName();
+  private static final String TAG = Log.tag(BackupPassphrase.class);
 
   public static @Nullable String get(@NonNull Context context) {
     String passphrase          = TextSecurePreferences.getBackupPassphrase(context);

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

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.logging.Log;
 import org.whispersystems.libsignal.util.ByteUtil;
 
 import java.security.MessageDigest;
@@ -13,7 +14,7 @@ import java.security.NoSuchAlgorithmException;
 public abstract class FullBackupBase {
 
   @SuppressWarnings("unused")
-  private static final String TAG = FullBackupBase.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupBase.class);
 
   static class BackupStream {
     static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {

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

@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.documentfile.provider.DocumentFile;
 
-import com.annimon.stream.function.Consumer;
 import com.annimon.stream.function.Predicate;
 import com.google.protobuf.ByteString;
 
@@ -26,7 +25,6 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
-import org.thoughtcrime.securesms.database.JobDatabase;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
@@ -36,9 +34,13 @@ 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.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.kdf.HKDFv3;
 import org.whispersystems.libsignal.util.ByteUtil;
@@ -66,8 +68,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class FullBackupExporter extends FullBackupBase {
 
-  @SuppressWarnings("unused")
-  private static final String TAG = FullBackupExporter.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupExporter.class);
 
   private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
     SignedPreKeyDatabase.TABLE_NAME,
@@ -81,11 +82,12 @@ public class FullBackupExporter extends FullBackupBase {
                             @NonNull AttachmentSecret attachmentSecret,
                             @NonNull SQLiteDatabase input,
                             @NonNull File output,
-                            @NonNull String passphrase)
+                            @NonNull String passphrase,
+                            @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
     try (OutputStream outputStream = new FileOutputStream(output)) {
-      internalExport(context, attachmentSecret, input, outputStream, passphrase);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
     }
   }
 
@@ -94,19 +96,32 @@ public class FullBackupExporter extends FullBackupBase {
                             @NonNull AttachmentSecret attachmentSecret,
                             @NonNull SQLiteDatabase input,
                             @NonNull DocumentFile output,
-                            @NonNull String passphrase)
+                            @NonNull String passphrase,
+                            @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
     try (OutputStream outputStream = Objects.requireNonNull(context.getContentResolver().openOutputStream(output.getUri()))) {
-      internalExport(context, attachmentSecret, input, outputStream, passphrase);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
     }
   }
 
+  public static void transfer(@NonNull Context context,
+                              @NonNull AttachmentSecret attachmentSecret,
+                              @NonNull SQLiteDatabase input,
+                              @NonNull OutputStream outputStream,
+                              @NonNull String passphrase)
+      throws IOException
+  {
+    internalExport(context, attachmentSecret, input, outputStream, passphrase, false, () -> false);
+  }
+
   private static void internalExport(@NonNull Context context,
                                      @NonNull AttachmentSecret attachmentSecret,
                                      @NonNull SQLiteDatabase input,
                                      @NonNull OutputStream fileOutputStream,
-                                     @NonNull String passphrase)
+                                     @NonNull String passphrase,
+                                     boolean closeOutputStream,
+                                     @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
     BackupFrameOutputStream outputStream = new BackupFrameOutputStream(fileOutputStream, passphrase);
@@ -114,36 +129,51 @@ public class FullBackupExporter extends FullBackupBase {
 
     try {
       outputStream.writeDatabaseVersion(input.getVersion());
+      count++;
 
       List<String> tables = exportSchema(input, outputStream);
+      count += tables.size() * 3;
 
       Stopwatch stopwatch = new Stopwatch("Backup");
 
       for (String table : tables) {
+        throwIfCanceled(cancellationSignal);
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, cancellationSignal);
         } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, cancellationSignal);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, cancellationSignal);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), cursor -> exportAttachment(attachmentSecret, cursor, outputStream), count);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
         } else if (table.equals(StickerDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> true, cursor -> exportSticker(attachmentSecret, cursor, outputStream), count);
+          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
         } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
-          count = exportTable(table, input, outputStream, null, null, count);
+          count = exportTable(table, input, outputStream, null, null, count, cancellationSignal);
         }
         stopwatch.split("table::" + table);
       }
 
       for (BackupProtos.SharedPreference preference : IdentityKeyUtil.getBackupRecord(context)) {
+        throwIfCanceled(cancellationSignal);
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        outputStream.write(preference);
+      }
+      
+      for (BackupProtos.SharedPreference preference : TextSecurePreferences.getPreferencesToSaveToBackup(context)) {
+        throwIfCanceled(cancellationSignal);
         EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         outputStream.write(preference);
       }
 
       stopwatch.split("prefs");
 
+      count = exportKeyValues(outputStream, SignalStore.getKeysToIncludeInBackup(), count, cancellationSignal);
+
+      stopwatch.split("key_values");
+
       for (AvatarHelper.Avatar avatar : AvatarHelper.getAvatars(context)) {
+        throwIfCanceled(cancellationSignal);
         if (avatar != null) {
           EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
           outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
@@ -155,11 +185,19 @@ public class FullBackupExporter extends FullBackupBase {
 
       outputStream.writeEnd();
     } finally {
-      outputStream.close();
+      if (closeOutputStream) {
+        outputStream.close();
+      }
       EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count));
     }
   }
 
+  private static void throwIfCanceled(@NonNull BackupCancellationSignal cancellationSignal) throws BackupCanceledException {
+    if (cancellationSignal.isCanceled()) {
+      throw new BackupCanceledException();
+    }
+  }
+
   private static List<String> exportSchema(@NonNull SQLiteDatabase input, @NonNull BackupFrameOutputStream outputStream)
       throws IOException
   {
@@ -190,19 +228,20 @@ public class FullBackupExporter extends FullBackupBase {
     return tables;
   }
 
-  private static int exportTable(@NonNull   String table,
-                                 @NonNull   SQLiteDatabase input,
-                                 @NonNull   BackupFrameOutputStream outputStream,
-                                 @Nullable  Predicate<Cursor> predicate,
-                                 @Nullable  Consumer<Cursor> postProcess,
-                                            int count)
+  private static int exportTable(@NonNull String table,
+                                 @NonNull SQLiteDatabase input,
+                                 @NonNull BackupFrameOutputStream outputStream,
+                                 @Nullable Predicate<Cursor> predicate,
+                                 @Nullable PostProcessor postProcess,
+                                 int count,
+                                 @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
     String template = "INSERT INTO " + table + " VALUES ";
 
     try (Cursor cursor = input.rawQuery("SELECT * FROM " + table, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        throwIfCanceled(cancellationSignal);
 
         if (predicate == null || predicate.test(cursor)) {
           StringBuilder                     statement        = new StringBuilder(template);
@@ -234,9 +273,12 @@ public class FullBackupExporter extends FullBackupBase {
 
           statement.append(')');
 
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
           outputStream.write(statementBuilder.setStatement(statement.toString()).build());
 
-          if (postProcess != null) postProcess.accept(cursor);
+          if (postProcess != null) {
+            count = postProcess.postProcess(cursor, count);
+          }
         }
       }
     }
@@ -244,7 +286,7 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  private static void exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream) {
+  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
       long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
@@ -269,14 +311,17 @@ public class FullBackupExporter extends FullBackupBase {
         if (random != null && random.length == 32) inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         else                                       inputStream = ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
 
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
       }
     } catch (IOException e) {
       Log.w(TAG, e);
     }
+
+    return count;
   }
 
-  private static void exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream) {
+  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
       long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
@@ -285,12 +330,15 @@ public class FullBackupExporter extends FullBackupBase {
       byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
 
       if (!TextUtils.isEmpty(data) && size > 0) {
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         outputStream.writeSticker(rowId, inputStream, size);
       }
     } catch (IOException e) {
       Log.w(TAG, e);
     }
+
+    return count;
   }
 
   private static long calculateVeryOldStreamLength(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) throws IOException {
@@ -310,6 +358,46 @@ public class FullBackupExporter extends FullBackupBase {
     return result;
   }
 
+  private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream,
+                                     @NonNull List<String> keysToIncludeInBackup,
+                                     int count,
+                                     BackupCancellationSignal cancellationSignal) throws IOException
+  {
+    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
+                                              .getDataSet();
+
+    for (String key : keysToIncludeInBackup) {
+      throwIfCanceled(cancellationSignal);
+      if (!dataSet.containsKey(key)) {
+        continue;
+      }
+      BackupProtos.KeyValue.Builder builder = BackupProtos.KeyValue.newBuilder()
+                                                                   .setKey(key);
+
+      Class<?> type = dataSet.getType(key);
+      if (type == byte[].class) {
+        builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null)));
+      } else if (type == Boolean.class) {
+        builder.setBooleanValue(dataSet.getBoolean(key, false));
+      } else if (type == Float.class) {
+        builder.setFloatValue(dataSet.getFloat(key, 0));
+      } else if (type == Integer.class) {
+        builder.setIntegerValue(dataSet.getInteger(key, 0));
+      } else if (type == Long.class) {
+        builder.setLongValue(dataSet.getLong(key, 0));
+      } else if (type == String.class) {
+        builder.setStringValue(dataSet.getString(key, null));
+      } else {
+        throw new AssertionError("Unknown type: " + type);
+      }
+
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+      outputStream.write(builder.build());
+    }
+
+    return count;
+  }
+
   private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
     return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
            cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
@@ -381,6 +469,10 @@ public class FullBackupExporter extends FullBackupBase {
       write(outputStream, BackupProtos.BackupFrame.newBuilder().setPreference(preference).build());
     }
 
+    public void write(BackupProtos.KeyValue keyValue) throws IOException {
+      write(outputStream, BackupProtos.BackupFrame.newBuilder().setKeyValue(keyValue).build());
+    }
+
     public void write(BackupProtos.SqlStatement statement) throws IOException {
       write(outputStream, BackupProtos.BackupFrame.newBuilder().setStatement(statement).build());
     }
@@ -495,4 +587,14 @@ public class FullBackupExporter extends FullBackupBase {
       outputStream.close();
     }
   }
+
+  public interface PostProcessor {
+    int postProcess(@NonNull Cursor cursor, int count);
+  }
+
+  public interface BackupCancellationSignal {
+    boolean isCanceled();
+  }
+
+  public static final class BackupCanceledException extends IOException { }
 }

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

@@ -26,8 +26,11 @@ import org.thoughtcrime.securesms.backup.BackupProtos.Sticker;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
@@ -45,6 +48,8 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -60,25 +65,37 @@ import javax.crypto.spec.SecretKeySpec;
 public class FullBackupImporter extends FullBackupBase {
 
   @SuppressWarnings("unused")
-  private static final String TAG = FullBackupImporter.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupImporter.class);
 
   public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                 @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)
       throws IOException
+  {
+    try (InputStream is = getInputStream(context, uri)) {
+      importFile(context, attachmentSecret, db, is, passphrase);
+    }
+  }
+
+  public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
+                                @NonNull SQLiteDatabase db, @NonNull InputStream is, @NonNull String passphrase)
+      throws IOException
   {
     int count = 0;
 
-    try (InputStream is = getInputStream(context, uri)) {
+    SQLiteDatabase keyValueDatabase = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).getSqlCipherDatabase();
+    try {
       BackupRecordInputStream inputStream = new BackupRecordInputStream(is, passphrase);
 
       db.beginTransaction();
+      keyValueDatabase.beginTransaction();
 
       dropAllTables(db);
 
       BackupFrame frame;
 
       while (!(frame = inputStream.readFrame()).getEnd()) {
-        if (count++ % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
+        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
+        count++;
 
         if      (frame.hasVersion())    processVersion(db, frame.getVersion());
         else if (frame.hasStatement())  processStatement(db, frame.getStatement());
@@ -86,18 +103,22 @@ public class FullBackupImporter extends FullBackupBase {
         else if (frame.hasAttachment()) processAttachment(context, attachmentSecret, db, frame.getAttachment(), inputStream);
         else if (frame.hasSticker())    processSticker(context, attachmentSecret, db, frame.getSticker(), inputStream);
         else if (frame.hasAvatar())     processAvatar(context, db, frame.getAvatar(), inputStream);
+        else if (frame.hasKeyValue())   processKeyValue(frame.getKeyValue());
+        else                            count--;
       }
 
       db.setTransactionSuccessful();
+      keyValueDatabase.setTransactionSuccessful();
     } finally {
       db.endTransaction();
+      keyValueDatabase.endTransaction();
     }
 
     EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count));
   }
 
   private static @NonNull InputStream getInputStream(@NonNull Context context, @NonNull Uri uri) throws IOException{
-    if (BackupUtil.isUserSelectionRequired(context)) {
+    if (BackupUtil.isUserSelectionRequired(context) || uri.getScheme().equals("content")) {
       return Objects.requireNonNull(context.getContentResolver().openInputStream(uri));
     } else {
       return new FileInputStream(new File(Objects.requireNonNull(uri.getPath())));
@@ -201,10 +222,40 @@ public class FullBackupImporter extends FullBackupBase {
     }
   }
 
+  private static void processKeyValue(BackupProtos.KeyValue keyValue) {
+    KeyValueDataSet dataSet = new KeyValueDataSet();
+
+    if (keyValue.hasBlobValue()) {
+      dataSet.putBlob(keyValue.getKey(), keyValue.getBlobValue().toByteArray());
+    } else if (keyValue.hasBooleanValue()) {
+      dataSet.putBoolean(keyValue.getKey(), keyValue.getBooleanValue());
+    } else if (keyValue.hasFloatValue()) {
+      dataSet.putFloat(keyValue.getKey(), keyValue.getFloatValue());
+    } else if (keyValue.hasIntegerValue()) {
+      dataSet.putInteger(keyValue.getKey(), keyValue.getIntegerValue());
+    } else if (keyValue.hasLongValue()) {
+      dataSet.putLong(keyValue.getKey(), keyValue.getLongValue());
+    } else if (keyValue.hasStringValue()) {
+      dataSet.putString(keyValue.getKey(), keyValue.getStringValue());
+    } else {
+      Log.i(TAG, "Unknown KeyValue backup value, skipping");
+      return;
+    }
+
+    KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).writeDataSet(dataSet, Collections.emptyList());
+  }
+
   @SuppressLint("ApplySharedPref")
   private static void processPreference(@NonNull Context context, SharedPreference preference) {
     SharedPreferences preferences = context.getSharedPreferences(preference.getFile(), 0);
-    preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
+
+    if (preference.hasValue()) {
+      preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
+    } else if (preference.hasBooleanValue()) {
+      preferences.edit().putBoolean(preference.getKey(), preference.getBooleanValue()).commit();
+    } else if (preference.hasIsStringSetValue() && preference.getIsStringSetValue()) {
+      preferences.edit().putStringSet(preference.getKey(), new HashSet<>(preference.getStringSetValueList())).commit();
+    }
   }
 
   private static void dropAllTables(@NonNull SQLiteDatabase db) {

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

@@ -9,11 +9,12 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 
 public class AlertView extends LinearLayout {
 
-  private static final String TAG = AlertView.class.getSimpleName();
+  private static final String TAG = Log.tag(AlertView.class);
 
   private ImageView approvalIndicator;
   private ImageView failedIndicator;

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

@@ -29,6 +29,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.audio.AudioWaveForm;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
@@ -42,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 
 public final class AudioView extends FrameLayout {
 
-  private static final String TAG = AudioView.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioView.class);
 
   private static final int FORWARDS =  1;
   private static final int REVERSE  = -1;

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

@@ -8,6 +8,7 @@ import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
@@ -15,6 +16,7 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
@@ -39,7 +41,7 @@ public final class AvatarImageView extends AppCompatImageView {
   private static final int SIZE_SMALL = 2;
 
   @SuppressWarnings("unused")
-  private static final String TAG = AvatarImageView.class.getSimpleName();
+  private static final String TAG = Log.tag(AvatarImageView.class);
 
   private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
   private static final Paint DARK_THEME_OUTLINE_PAINT  = new Paint();
@@ -118,11 +120,18 @@ public final class AvatarImageView extends AppCompatImageView {
    * Shows self as the actual profile picture.
    */
   public void setRecipient(@NonNull Recipient recipient) {
+    setRecipient(recipient, false);
+  }
+
+  /**
+   * Shows self as the actual profile picture.
+   */
+  public void setRecipient(@NonNull Recipient recipient, boolean quickContactEnabled) {
     if (recipient.isSelf()) {
-      setAvatar(GlideApp.with(this), null, false);
+      setAvatar(GlideApp.with(this), null, quickContactEnabled);
       AvatarUtil.loadIconIntoImageView(recipient, this);
     } else {
-      setAvatar(GlideApp.with(this), recipient, false);
+      setAvatar(GlideApp.with(this), recipient, quickContactEnabled);
     }
   }
 
@@ -204,8 +213,7 @@ public final class AvatarImageView extends AppCompatImageView {
         }
       });
     } else {
-      super.setOnClickListener(listener);
-      setClickable(listener != null);
+      disableQuickContact();
     }
   }
 
@@ -226,6 +234,16 @@ public final class AvatarImageView extends AppCompatImageView {
             .into(this);
   }
 
+  public void setNonAvatarImageResource(@DrawableRes int imageResource) {
+    recipientContactPhoto = null;
+    setImageResource(imageResource);
+  }
+
+  public void disableQuickContact() {
+    super.setOnClickListener(listener);
+    setClickable(listener != null);
+  }
+
   private static class RecipientContactPhoto {
 
     private final @NonNull  Recipient    recipient;

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

@@ -365,7 +365,7 @@ public class ComposeText extends EmojiEditText {
 
   private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {
 
-    private static final String TAG = CommitContentListener.class.getSimpleName();
+    private static final String TAG = Log.tag(CommitContentListener.class);
 
     private final InputPanel.MediaListener mediaListener;
 

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

@@ -31,7 +31,7 @@ import java.net.URISyntaxException;
 
 public class CustomDefaultPreference extends DialogPreference {
 
-  private static final String TAG = CustomDefaultPreference.class.getSimpleName();
+  private static final String TAG = Log.tag(CustomDefaultPreference.class);
 
   private final int    inputType;
   private final String customPreference;

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

@@ -10,11 +10,12 @@ import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 
 public class DeliveryStatusView extends FrameLayout {
 
-  private static final String TAG = DeliveryStatusView.class.getSimpleName();
+  private static final String TAG = Log.tag(DeliveryStatusView.class);
 
   private static final RotateAnimation ROTATION_ANIMATION = new RotateAnimation(0, 360f,
                                                                                 Animation.RELATIVE_TO_SELF, 0.5f,

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

@@ -20,6 +20,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
@@ -29,7 +30,7 @@ import org.thoughtcrime.securesms.util.Util;
 
 public class DocumentView extends FrameLayout {
 
-  private static final String TAG = DocumentView.class.getSimpleName();
+  private static final String TAG = Log.tag(DocumentView.class);
 
   private final @NonNull AnimatingToggle controlToggle;
   private final @NonNull ImageView       downloadButton;

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

@@ -6,8 +6,8 @@ import android.util.AttributeSet;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
@@ -67,7 +67,7 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
       else          stopped = false;
     }
 
-    Util.runOnMainDelayed(new AnimationUpdateRunnable(this), calculateAnimationDelay(this.startedAt, this.expiresIn));
+    ThreadUtil.runOnMainDelayed(new AnimationUpdateRunnable(this), calculateAnimationDelay(this.startedAt, this.expiresIn));
   }
 
   public void stopAnimation() {
@@ -116,7 +116,7 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
         }
       }
 
-      Util.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
+      ThreadUtil.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
     }
   }
 

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

@@ -10,13 +10,14 @@ import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 public class FromTextView extends EmojiTextView {
 
-  private static final String TAG = FromTextView.class.getSimpleName();
+  private static final String TAG = Log.tag(FromTextView.class);
 
   public FromTextView(Context context) {
     super(context);

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

@@ -22,10 +22,10 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
@@ -42,7 +42,6 @@ import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -59,7 +58,7 @@ public class InputPanel extends LinearLayout
                ConversationStickerSuggestionAdapter.EventListener
 {
 
-  private static final String TAG = InputPanel.class.getSimpleName();
+  private static final String TAG = Log.tag(InputPanel.class);
 
   private static final long QUOTE_REVEAL_DURATION_MILLIS = 150;
   private static final int  FADE_TIME                    = 150;
@@ -501,7 +500,7 @@ public class InputPanel extends LinearLayout
       this.startTime = System.currentTimeMillis();
       this.recordTimeView.setText(DateUtils.formatElapsedTime(0));
       ViewUtil.fadeIn(this.recordTimeView, FADE_TIME);
-      Util.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
+      ThreadUtil.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
       microphone.setVisibility(View.VISIBLE);
       microphone.startAnimation(pulseAnimation());
     }
@@ -527,7 +526,7 @@ public class InputPanel extends LinearLayout
           onLimitHit.run();
         } else {
           recordTimeView.setText(DateUtils.formatElapsedTime(elapsedSeconds));
-          Util.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
+          ThreadUtil.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
         }
       }
     }

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

@@ -43,7 +43,7 @@ import java.util.Set;
  * has been opened and what its height would be.
  */
 public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
-  private static final String TAG = KeyboardAwareLinearLayout.class.getSimpleName();
+  private static final String TAG = Log.tag(KeyboardAwareLinearLayout.class);
 
   private final Rect                          rect                       = new Rect();
   private final Set<OnKeyboardHiddenListener> hiddenListeners            = new HashSet<>();

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

@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.util.Locale;
 
 import okhttp3.HttpUrl;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * The view shown in the compose box or conversation that represents the state of the link preview.
@@ -181,10 +182,16 @@ public class LinkPreviewView extends FrameLayout {
     }
   }
 
-  public void setCorners(int topLeft, int topRight) {
-    cornerMask.setRadii(topLeft, topRight, 0, 0);
-    outliner.setRadii(topLeft, topRight, 0, 0);
-    thumbnail.setCorners(topLeft, defaultRadius, defaultRadius, defaultRadius);
+  public void setCorners(int topStart, int topEnd) {
+    if (ViewUtil.isRtl(this)) {
+      cornerMask.setRadii(topEnd, topStart, 0, 0);
+      outliner.setRadii(topEnd, topStart, 0, 0);
+      thumbnail.setCorners(defaultRadius, topEnd, defaultRadius, defaultRadius);
+    } else {
+      cornerMask.setRadii(topStart, topEnd, 0, 0);
+      outliner.setRadii(topStart, topEnd, 0, 0);
+      thumbnail.setCorners(topStart, defaultRadius, defaultRadius, defaultRadius);
+    }
     postInvalidate();
   }
 

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

@@ -0,0 +1,64 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import org.thoughtcrime.securesms.R;
+
+public class PaymentPillStrip extends ConstraintLayout {
+
+  private FrameLayout   buttonStart;
+  private FrameLayout   buttonEnd;
+
+  public PaymentPillStrip(@NonNull Context context) {
+    super(context);
+  }
+
+  public PaymentPillStrip(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public PaymentPillStrip(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  public PaymentPillStrip(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+
+    buttonStart = findViewById(R.id.button_start_frame);
+    buttonEnd   = findViewById(R.id.button_end_frame);
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+    if (buttonStart.getMeasuredWidth() > buttonEnd.getMinimumWidth()) {
+      buttonEnd.setMinimumWidth(buttonStart.getMeasuredWidth());
+    }
+
+    if (buttonEnd.getMeasuredWidth() > buttonStart.getMinimumWidth()) {
+      buttonStart.setMinimumWidth(buttonEnd.getMeasuredWidth());
+    }
+
+    if (buttonStart.getMeasuredHeight() > buttonEnd.getMinimumHeight()) {
+      buttonEnd.setMinimumHeight(buttonStart.getMeasuredHeight());
+    }
+
+    if (buttonEnd.getMeasuredHeight() > buttonStart.getMinimumHeight()) {
+      buttonStart.setMinimumHeight(buttonEnd.getMeasuredHeight());
+    }
+
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+  }
+}

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

@@ -28,6 +28,7 @@ import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contacts.RecipientsAdapter;
 import org.thoughtcrime.securesms.contacts.RecipientsEditor;
@@ -45,7 +46,7 @@ import java.util.StringTokenizer;
  * @author Moxie Marlinspike
  */
 public class PushRecipientsPanel extends RelativeLayout implements RecipientForeverObserver {
-  private final String                         TAG = PushRecipientsPanel.class.getSimpleName();
+  private final String                         TAG = Log.tag(PushRecipientsPanel.class);
   private       RecipientsPanelChangedListener panelChangeListener;
 
   private RecipientsEditor recipientsText;

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

@@ -21,6 +21,7 @@ import androidx.annotation.RequiresApi;
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
@@ -38,7 +39,7 @@ import java.util.List;
 
 public class QuoteView extends FrameLayout implements RecipientForeverObserver {
 
-  private static final String TAG = QuoteView.class.getSimpleName();
+  private static final String TAG = Log.tag(QuoteView.class);
 
   private static final int MESSAGE_TYPE_PREVIEW  = 0;
   private static final int MESSAGE_TYPE_OUTGOING = 1;

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

@@ -10,7 +10,9 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.VersionTracker;
 
@@ -21,10 +23,10 @@ public class RatingManager {
   private static final int DAYS_SINCE_INSTALL_THRESHOLD  = 7;
   private static final int DAYS_UNTIL_REPROMPT_THRESHOLD = 4;
 
-  private static final String TAG = RatingManager.class.getSimpleName();
+  private static final String TAG = Log.tag(RatingManager.class);
 
   public static void showRatingDialogIfNecessary(Context context) {
-    if (!TextSecurePreferences.isRatingEnabled(context)) return;
+    if (!TextSecurePreferences.isRatingEnabled(context) || BuildConfig.PLAY_STORE_DISABLED) return;
 
     long daysSinceInstall = VersionTracker.getDaysSinceFirstInstalled(context);
     long laterTimestamp   = TextSecurePreferences.getRatingLaterTimestamp(context);
@@ -44,7 +46,7 @@ public class RatingManager {
           @Override
           public void onClick(DialogInterface dialog, int which) {
             TextSecurePreferences.setRatingEnabled(context, false);
-            startPlayStore(context);
+            PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(context);
          }
        })
        .setNegativeButton(R.string.RatingManager_no_thanks, new DialogInterface.OnClickListener() {
@@ -62,15 +64,4 @@ public class RatingManager {
        })
        .show();
   }
-
-  private static void startPlayStore(Context context) {
-    Uri uri = Uri.parse("market://details?id=" + context.getPackageName());
-    try {
-      context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
-    } catch (ActivityNotFoundException e) {
-      Log.w(TAG, e);
-      Toast.makeText(context, R.string.RatingManager_whoops_the_play_store_app_does_not_appear_to_be_installed, Toast.LENGTH_LONG).show();
-    }
-  }
-
 }

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

@@ -28,6 +28,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.signature.MediaStoreSignature;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.loaders.RecentPhotosLoader;
@@ -82,7 +83,7 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo
   private static class RecentPhotoAdapter extends CursorRecyclerViewAdapter<RecentPhotoAdapter.RecentPhotoViewHolder> {
 
     @SuppressWarnings("unused")
-    private static final String TAG = RecentPhotoAdapter.class.getSimpleName();
+    private static final String TAG = Log.tag(RecentPhotoAdapter.class);
 
     @NonNull  private final Uri baseUri;
     @Nullable private OnItemClickedListener clickedListener;

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

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
@@ -61,7 +62,7 @@ public class ThreadPhotoRailView extends FrameLayout {
   private static class ThreadPhotoRailAdapter extends CursorRecyclerViewAdapter<ThreadPhotoRailAdapter.ThreadPhotoViewHolder> {
 
     @SuppressWarnings("unused")
-    private static final String TAG = ThreadPhotoRailAdapter.class.getSimpleName();
+    private static final String TAG = Log.tag(ThreadPhotoRailAdapter.class);
 
     @NonNull  private final GlideRequests glideRequests;
 

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

@@ -47,7 +47,7 @@ import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOption
 
 public class ThumbnailView extends FrameLayout {
 
-  private static final String TAG        = ThumbnailView.class.getSimpleName();
+  private static final String TAG        = Log.tag(ThumbnailView.class);
   private static final int    WIDTH      = 0;
   private static final int    HEIGHT     = 1;
   private static final int    MIN_WIDTH  = 0;

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

@@ -10,6 +10,7 @@ import androidx.lifecycle.MutableLiveData;
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
@@ -26,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressLint("UseSparseArrays")
 public class TypingStatusRepository {
 
-  private static final String TAG = TypingStatusRepository.class.getSimpleName();
+  private static final String TAG = Log.tag(TypingStatusRepository.class);
 
   private static final long RECIPIENT_TYPING_TIMEOUT = TimeUnit.SECONDS.toMillis(15);
 
@@ -58,11 +59,11 @@ public class TypingStatusRepository {
 
     Runnable timer = timers.get(typist);
     if (timer != null) {
-      Util.cancelRunnableOnMain(timer);
+      ThreadUtil.cancelRunnableOnMain(timer);
     }
 
     timer = () -> onTypingStopped(context, threadId, author, device, false);
-    Util.runOnMainDelayed(timer, RECIPIENT_TYPING_TIMEOUT);
+    ThreadUtil.runOnMainDelayed(timer, RECIPIENT_TYPING_TIMEOUT);
     timers.put(typist, timer);
   }
 
@@ -85,7 +86,7 @@ public class TypingStatusRepository {
 
     Runnable timer = timers.get(typist);
     if (timer != null) {
-      Util.cancelRunnableOnMain(timer);
+      ThreadUtil.cancelRunnableOnMain(timer);
       timers.remove(typist);
     }
   }

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

@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms.components;
 
 import android.annotation.SuppressLint;
-import android.app.Application;
-import android.content.Context;
-
-import androidx.annotation.NonNull;
 
+import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.util.Util;
@@ -17,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressLint("UseSparseArrays")
 public class TypingStatusSender {
 
-  private static final String TAG = TypingStatusSender.class.getSimpleName();
+  private static final String TAG = Log.tag(TypingStatusSender.class);
 
   private static final long REFRESH_TYPING_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
   private static final long PAUSE_TYPING_TIMEOUT   = TimeUnit.SECONDS.toMillis(3);
@@ -36,16 +34,16 @@ public class TypingStatusSender {
       sendTyping(threadId, true);
 
       Runnable start = new StartRunnable(threadId);
-      Util.runOnMainDelayed(start, REFRESH_TYPING_TIMEOUT);
+      ThreadUtil.runOnMainDelayed(start, REFRESH_TYPING_TIMEOUT);
       pair.setStart(start);
     }
 
     if (pair.getStop() != null) {
-      Util.cancelRunnableOnMain(pair.getStop());
+      ThreadUtil.cancelRunnableOnMain(pair.getStop());
     }
 
     Runnable stop = () -> onTypingStopped(threadId, true);
-    Util.runOnMainDelayed(stop, PAUSE_TYPING_TIMEOUT);
+    ThreadUtil.runOnMainDelayed(stop, PAUSE_TYPING_TIMEOUT);
     pair.setStop(stop);
   }
 
@@ -62,7 +60,7 @@ public class TypingStatusSender {
     selfTypingTimers.put(threadId, pair);
 
     if (pair.getStart() != null) {
-      Util.cancelRunnableOnMain(pair.getStart());
+      ThreadUtil.cancelRunnableOnMain(pair.getStart());
 
       if (notify) {
         sendTyping(threadId, false);
@@ -70,7 +68,7 @@ public class TypingStatusSender {
     }
 
     if (pair.getStop() != null) {
-      Util.cancelRunnableOnMain(pair.getStop());
+      ThreadUtil.cancelRunnableOnMain(pair.getStop());
     }
 
     pair.setStart(null);
@@ -92,7 +90,7 @@ public class TypingStatusSender {
     @Override
     public void run() {
       sendTyping(threadId, true);
-      Util.runOnMainDelayed(this, REFRESH_TYPING_TIMEOUT);
+      ThreadUtil.runOnMainDelayed(this, REFRESH_TYPING_TIMEOUT);
     }
   }
 

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

@@ -0,0 +1,74 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.conversationlist.model.UnreadPayments;
+
+/**
+ * Displays the data in a given UnreadPayments object in a banner.
+ */
+public class UnreadPaymentsView extends ConstraintLayout {
+
+  private TextView        title;
+  private AvatarImageView avatar;
+  private Listener        listener;
+
+  public UnreadPaymentsView(@NonNull Context context) {
+    super(context);
+  }
+
+  public UnreadPaymentsView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public UnreadPaymentsView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  public UnreadPaymentsView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+
+    title  = findViewById(R.id.payment_notification_title);
+    avatar = findViewById(R.id.payment_notification_avatar);
+
+    View open  = findViewById(R.id.payment_notification_touch_target);
+    View close = findViewById(R.id.payment_notification_close_touch_target);
+
+    open.setOnClickListener(v -> {
+      if (listener != null) listener.onOpenPaymentsNotificationClicked();
+    });
+
+    close.setOnClickListener(v -> {
+      if (listener != null) listener.onClosePaymentsNotificationClicked();
+    });
+  }
+
+  public void setListener(@NonNull Listener listener) {
+    this.listener = listener;
+  }
+
+  public void setUnreadPayments(@NonNull UnreadPayments unreadPayments) {
+    title.setText(unreadPayments.getDescription(getContext()));
+    avatar.setAvatar(unreadPayments.getRecipient());
+    avatar.setVisibility(unreadPayments.getRecipient() == null ? GONE : VISIBLE);
+  }
+
+  public interface Listener {
+    void onOpenPaymentsNotificationClicked();
+
+    void onClosePaymentsNotificationClicked();
+  }
+}

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

@@ -35,13 +35,17 @@ import java.io.InputStream;
 
 public class ZoomingImageView extends FrameLayout {
 
-  private static final String TAG = ZoomingImageView.class.getSimpleName();
+  private static final String TAG = Log.tag(ZoomingImageView.class);
 
   private static final int ZOOM_TRANSITION_DURATION = 300;
 
   private static final float ZOOM_LEVEL_MIN = 1.0f;
-  private static final float ZOOM_LEVEL_MID = 1.5f;
-  private static final float ZOOM_LEVEL_MAX = 2.0f;
+
+  private static final float LARGE_IMAGES_ZOOM_LEVEL_MID = 1.5f;
+  private static final float LARGE_IMAGES_ZOOM_LEVEL_MAX = 2.0f;
+
+  private static final float SMALL_IMAGES_ZOOM_LEVEL_MID = 3.0f;
+  private static final float SMALL_IMAGES_ZOOM_LEVEL_MAX = 8.0f;
 
   private final PhotoView                 photoView;
   private final SubsamplingScaleImageView subsamplingImageView;
@@ -65,10 +69,11 @@ public class ZoomingImageView extends FrameLayout {
     this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
 
     this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
-    this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, ZOOM_LEVEL_MID, ZOOM_LEVEL_MAX);
+    this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX);
 
     this.subsamplingImageView.setDoubleTapZoomDuration(ZOOM_TRANSITION_DURATION);
-    this.subsamplingImageView.setDoubleTapZoomScale(ZOOM_LEVEL_MID);
+    this.subsamplingImageView.setDoubleTapZoomScale(LARGE_IMAGES_ZOOM_LEVEL_MID);
+    this.subsamplingImageView.setMaxScale(LARGE_IMAGES_ZOOM_LEVEL_MAX);
 
     this.photoView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
     this.subsamplingImageView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java

@@ -21,7 +21,7 @@ import java.util.Locale;
 
 @SuppressWarnings("deprecation")
 public class CameraUtils {
-  private static final String TAG = CameraUtils.class.getSimpleName();
+  private static final String TAG = Log.tag(CameraUtils.class);
   /*
    * modified from: https://github.com/commonsguy/cwac-camera/blob/master/camera/src/com/commonsware/cwac/camera/CameraUtils.java
    */

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -36,6 +36,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.BitmapUtil;
@@ -50,7 +51,7 @@ import java.util.List;
 
 @SuppressWarnings("deprecation")
 public class CameraView extends ViewGroup {
-  private static final String TAG = CameraView.class.getSimpleName();
+  private static final String TAG = Log.tag(CameraView.class);
 
   private final CameraSurfaceView   surface;
   private final OnOrientationChange onOrientationChange;
@@ -320,7 +321,7 @@ public class CameraView extends ViewGroup {
         camera.startPreview();
         Log.i(TAG, "camera.startPreview() -> " + (System.currentTimeMillis() - previewStartMillis) + "ms");
         state = State.ACTIVE;
-        Util.runOnMain(new Runnable() {
+        ThreadUtil.runOnMain(new Runnable() {
           @Override
           public void run() {
             requestLayout();
@@ -495,9 +496,9 @@ public class CameraView extends ViewGroup {
         return;
       }
 
-      Util.runOnMainSync(this::onPreMain);
+      ThreadUtil.runOnMainSync(this::onPreMain);
       final Result result = onRunBackground();
-      Util.runOnMainSync(() -> onPostMain(result));
+      ThreadUtil.runOnMainSync(() -> onPostMain(result));
     }
 
     protected boolean onWait() { return true; }

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

@@ -10,13 +10,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 
 public class EmojiEditText extends AppCompatEditText {
-  private static final String TAG = EmojiEditText.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiEditText.class);
 
   public EmojiEditText(Context context) {
     this(context, null);

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

@@ -10,12 +10,13 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
 
 public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
-  private static final String TAG = EmojiPageView.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiPageView.class);
 
   private EmojiPageModel                   model;
   private EmojiPageViewGridAdapter         adapter;

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

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo;
@@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
-import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 
 import java.util.List;
@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutionException;
 
 class EmojiProvider {
 
-  private static final    String        TAG      = EmojiProvider.class.getSimpleName();
+  private static final    String        TAG      = Log.tag(EmojiProvider.class);
   private static volatile EmojiProvider instance = null;
   private static final    Paint         paint    = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);
 
@@ -118,7 +118,7 @@ class EmojiProvider {
     final EmojiDrawable drawable = new EmojiDrawable(drawInfo, decodeScale);
     drawInfo.getPage().get().addListener(new FutureTaskListener<Bitmap>() {
       @Override public void onSuccess(final Bitmap result) {
-        Util.runOnMain(() -> drawable.setBitmap(result));
+        ThreadUtil.runOnMain(() -> drawable.setBitmap(result));
       }
 
       @Override public void onFailure(ExecutionException error) {
@@ -170,7 +170,7 @@ class EmojiProvider {
 
     @TargetApi(VERSION_CODES.HONEYCOMB_MR1)
     public void setBitmap(Bitmap bitmap) {
-      Util.assertMainThread();
+      ThreadUtil.assertMainThread();
       if (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB_MR1 || bmp == null || !bmp.sameAs(bitmap)) {
         bmp = bitmap;
         invalidateSelf();

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

@@ -24,7 +24,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 public class RecentEmojiPageModel implements EmojiPageModel {
-  private static final String TAG            = RecentEmojiPageModel.class.getSimpleName();
+  private static final String TAG            = Log.tag(RecentEmojiPageModel.class);
   private static final int    EMOJI_LRU_SIZE = 50;
 
   private final SharedPreferences     prefs;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java

@@ -8,6 +8,7 @@ import android.graphics.BitmapFactory;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
 import org.thoughtcrime.securesms.util.ListenableFutureTask;
@@ -22,7 +23,7 @@ import java.util.concurrent.Callable;
 
 public class EmojiPageBitmap {
 
-  private static final String TAG = EmojiPageBitmap.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiPageBitmap.class);
 
   private final Context        context;
   private final EmojiPageModel model;
@@ -39,7 +40,7 @@ public class EmojiPageBitmap {
 
   @SuppressLint("StaticFieldLeak")
   public ListenableFutureTask<Bitmap> get() {
-    Util.assertMainThread();
+    ThreadUtil.assertMainThread();
 
     if (bitmapReference != null && bitmapReference.get() != null) {
       return new ListenableFutureTask<>(bitmapReference.get());

app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java

@@ -8,15 +8,15 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.util.List;
 
-import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
-
 public class UntrustedSendDialog extends AlertDialog.Builder implements DialogInterface.OnClickListener {
 
   private final List<IdentityRecord> untrustedRecords;
@@ -43,7 +43,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn
     final IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(getContext());
 
     SimpleTask.run(() -> {
-      synchronized (SESSION_LOCK) {
+      try(SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
         for (IdentityRecord identityRecord : untrustedRecords) {
           identityDatabase.setApproval(identityRecord.getRecipientId(), true);
         }

app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 public class UnverifiedBannerView extends LinearLayout {
 
-  private static final String TAG = UnverifiedBannerView.class.getSimpleName();
+  private static final String TAG = Log.tag(UnverifiedBannerView.class);
 
   private View      container;
   private TextView  text;

app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java

@@ -8,14 +8,14 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.util.List;
 
-import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
-
 public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogInterface.OnClickListener {
 
   private final List<IdentityRecord> untrustedRecords;
@@ -44,7 +44,7 @@ public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogI
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        synchronized (SESSION_LOCK) {
+        try(SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
           for (IdentityRecord identityRecord : untrustedRecords) {
             identityDatabase.setVerified(identityRecord.getRecipientId(),
                                          identityRecord.getIdentityKey(),

app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 public class SignalPlace {
 
   private static final String URL = "https://maps.google.com/maps";
-  private static final String TAG = SignalPlace.class.getSimpleName();
+  private static final String TAG = Log.tag(SignalPlace.class);
 
   @JsonProperty
   private CharSequence name;

app/src/main/java/org/thoughtcrime/securesms/components/sensors/DeviceOrientationMonitor.java

@@ -65,7 +65,10 @@ public final class DeviceOrientationMonitor implements DefaultLifecycleObserver
   }
 
   private void updateOrientationAngles() {
-    SensorManager.getRotationMatrix(rotationMatrix, null, accelerometerReading, magnetometerReading);
+    boolean success = SensorManager.getRotationMatrix(rotationMatrix, null, accelerometerReading, magnetometerReading);
+    if (!success) {
+      SensorUtil.getRotationMatrixWithoutMagneticSensorData(rotationMatrix, accelerometerReading);
+    }
     SensorManager.getOrientation(rotationMatrix, orientationAngles);
 
     float pitch = orientationAngles[1];

app/src/main/java/org/thoughtcrime/securesms/components/sensors/SensorUtil.java

@@ -0,0 +1,92 @@
+package org.thoughtcrime.securesms.components.sensors;
+
+public final class SensorUtil {
+
+  private SensorUtil() { }
+
+  public static void getRotationMatrixWithoutMagneticSensorData(float[] rotationMatrix, float[] accelerometerReading) {
+    double gx, gy, gz;
+    gx = accelerometerReading[0] / 9.81f;
+    gy = accelerometerReading[1] / 9.81f;
+    gz = accelerometerReading[2] / 9.81f;
+
+    float pitch   = (float) -Math.atan(gy / Math.sqrt(gx * gx + gz * gz));
+    float roll    = (float) -Math.atan(gx / Math.sqrt(gy * gy + gz * gz));
+    float azimuth = 0;
+
+    float[] fakeMagnetometerReading = { azimuth, pitch, roll };
+
+    System.arraycopy(getRotationMatrixForOrientation(fakeMagnetometerReading), 0, rotationMatrix, 0, rotationMatrix.length);
+  }
+
+  private static float[] getRotationMatrixForOrientation(float[] o) {
+    float[] xM = new float[9];
+    float[] yM = new float[9];
+    float[] zM = new float[9];
+
+    float sinX = (float) Math.sin(o[1]);
+    float cosX = (float) Math.cos(o[1]);
+    float sinY = (float) Math.sin(o[2]);
+    float cosY = (float) Math.cos(o[2]);
+    float sinZ = (float) Math.sin(o[0]);
+    float cosZ = (float) Math.cos(o[0]);
+
+    xM[0] = 1.0f;
+    xM[1] = 0.0f;
+    xM[2] = 0.0f;
+
+    xM[3] = 0.0f;
+    xM[4] = cosX;
+    xM[5] = sinX;
+
+    xM[6] = 0.0f;
+    xM[7] = -sinX;
+    xM[8] = cosX;
+
+    yM[0] = cosY;
+    yM[1] = 0.0f;
+    yM[2] = sinY;
+
+    yM[3] = 0.0f;
+    yM[4] = 1.0f;
+    yM[5] = 0.0f;
+
+    yM[6] = -sinY;
+    yM[7] = 0.0f;
+    yM[8] = cosY;
+
+    zM[0] = cosZ;
+    zM[1] = sinZ;
+    zM[2] = 0.0f;
+
+    zM[3] = -sinZ;
+    zM[4] = cosZ;
+    zM[5] = 0.0f;
+
+    zM[6] = 0.0f;
+    zM[7] = 0.0f;
+    zM[8] = 1.0f;
+
+    float[] resultMatrix = matrixMultiplication(xM, yM);
+    resultMatrix = matrixMultiplication(zM, resultMatrix);
+    return resultMatrix;
+  }
+
+  private static float[] matrixMultiplication(float[] A, float[] B) {
+    float[] result = new float[9];
+
+    result[0] = A[0] * B[0] + A[1] * B[3] + A[2] * B[6];
+    result[1] = A[0] * B[1] + A[1] * B[4] + A[2] * B[7];
+    result[2] = A[0] * B[2] + A[1] * B[5] + A[2] * B[8];
+
+    result[3] = A[3] * B[0] + A[4] * B[3] + A[5] * B[6];
+    result[4] = A[3] * B[1] + A[4] * B[4] + A[5] * B[7];
+    result[5] = A[3] * B[2] + A[4] * B[5] + A[5] * B[8];
+
+    result[6] = A[6] * B[0] + A[7] * B[3] + A[8] * B[6];
+    result[7] = A[6] * B[1] + A[7] * B[4] + A[8] * B[7];
+    result[8] = A[6] * B[2] + A[7] * B[5] + A[8] * B[8];
+
+    return result;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/BaseSettingsAdapter.java

@@ -9,6 +9,12 @@ import org.thoughtcrime.securesms.util.MappingAdapter;
  * Reusable adapter for generic settings list.
  */
 public class BaseSettingsAdapter extends MappingAdapter {
+
+  public BaseSettingsAdapter() {
+    registerFactory(SettingHeader.Item.class, SettingHeader.ViewHolder::new, R.layout.base_settings_header_item);
+    registerFactory(SettingProgress.Item.class, SettingProgress.ViewHolder::new, R.layout.base_settings_progress_item);
+  }
+
   public void configureSingleSelect(@NonNull SingleSelectSetting.SingleSelectSelectionChangedListener selectionChangedListener) {
     registerFactory(SingleSelectSetting.Item.class,
                     new LayoutFactory<>(v -> new SingleSelectSetting.ViewHolder(v, selectionChangedListener), R.layout.single_select_item));

app/src/main/java/org/thoughtcrime/securesms/components/settings/CustomizableSingleSelectSetting.java

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.components.settings;
 
 import android.view.View;
-import android.widget.RadioButton;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,13 +18,11 @@ import java.util.Objects;
 public class CustomizableSingleSelectSetting {
 
   public interface CustomizableSingleSelectionListener extends SingleSelectSetting.SingleSelectSelectionChangedListener {
-    void onCustomizeClicked(@NonNull Item item);
+    void onCustomizeClicked(@Nullable Item item);
   }
 
   public static class ViewHolder extends MappingViewHolder<Item> {
-    private final TextView                            summaryText;
     private final View                                customize;
-    private final RadioButton                         radio;
     private final SingleSelectSetting.ViewHolder      delegate;
     private final Group                               customizeGroup;
     private final CustomizableSingleSelectionListener selectionListener;
@@ -35,50 +31,34 @@ public class CustomizableSingleSelectSetting {
       super(itemView);
       this.selectionListener = selectionListener;
 
-      radio          = findViewById(R.id.customizable_single_select_radio);
-      summaryText    = findViewById(R.id.customizable_single_select_summary);
       customize      = findViewById(R.id.customizable_single_select_customize);
       customizeGroup = findViewById(R.id.customizable_single_select_customize_group);
 
-      delegate = new SingleSelectSetting.ViewHolder(itemView, selectionListener) {
-        @Override
-        protected void setChecked(boolean checked) {
-          radio.setChecked(checked);
-        }
-      };
+      delegate = new SingleSelectSetting.ViewHolder(itemView, selectionListener);
     }
 
     @Override
     public void bind(@NonNull Item model) {
       delegate.bind(model.singleSelectItem);
-      customizeGroup.setVisibility(radio.isChecked() ? View.VISIBLE : View.GONE);
+      customizeGroup.setVisibility(model.singleSelectItem.isSelected() ? View.VISIBLE : View.GONE);
       customize.setOnClickListener(v -> selectionListener.onCustomizeClicked(model));
-      if (model.getCustomValue() != null) {
-        summaryText.setText(model.getSummaryText());
-      }
     }
   }
 
   public static class Item implements MappingModel<Item> {
-    private SingleSelectSetting.Item singleSelectItem;
-    private Object                   customValue;
-    private String                   summaryText;
+    private final SingleSelectSetting.Item singleSelectItem;
+    private final Object                   customValue;
 
     public <T> Item(@NonNull T item, @Nullable String text, boolean isSelected, @Nullable Object customValue, @Nullable String summaryText) {
       this.customValue = customValue;
-      this.summaryText = summaryText;
 
-      singleSelectItem = new SingleSelectSetting.Item(item, text, isSelected);
+      singleSelectItem = new SingleSelectSetting.Item(item, text, summaryText, isSelected);
     }
 
     public @Nullable Object getCustomValue() {
       return customValue;
     }
 
-    public @Nullable String getSummaryText() {
-      return summaryText;
-    }
-
     @Override
     public boolean areItemsTheSame(@NonNull Item newItem) {
       return singleSelectItem.areItemsTheSame(newItem.singleSelectItem);
@@ -86,7 +66,7 @@ public class CustomizableSingleSelectSetting {
 
     @Override
     public boolean areContentsTheSame(@NonNull Item newItem) {
-      return singleSelectItem.areContentsTheSame(newItem.singleSelectItem) && Objects.equals(customValue, newItem.customValue) && Objects.equals(summaryText, newItem.summaryText);
+      return singleSelectItem.areContentsTheSame(newItem.singleSelectItem) && Objects.equals(customValue, newItem.customValue);
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/SettingHeader.java

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.components.settings;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.MappingViewHolder;
+
+import java.util.Objects;
+
+/**
+ * Provide a default header {@link MappingModel} and {@link MappingViewHolder} for settings screens.
+ */
+public final class SettingHeader {
+
+  public static final class ViewHolder extends MappingViewHolder<Item> {
+
+    private final TextView headerText;
+
+    public ViewHolder(@NonNull View itemView) {
+      super(itemView);
+      this.headerText = findViewById(R.id.base_settings_header_item_text);
+    }
+
+    @Override
+    public void bind(@NonNull Item model) {
+      if (model.text != null) {
+        headerText.setText(model.text);
+      } else {
+        headerText.setText(model.textRes);
+      }
+    }
+  }
+
+  public static final class Item implements MappingModel<Item> {
+    private final int    textRes;
+    private final String text;
+
+    public Item(String text) {
+      this.text    = text;
+      this.textRes = 0;
+    }
+
+    public Item(@StringRes int textRes) {
+      this.text    = null;
+      this.textRes = textRes;
+    }
+
+    @Override
+    public boolean areItemsTheSame(@NonNull Item newItem) {
+      return textRes == newItem.textRes && Objects.equals(text, newItem.text);
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull Item newItem) {
+      return areItemsTheSame(newItem);
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/SettingProgress.java

@@ -0,0 +1,46 @@
+package org.thoughtcrime.securesms.components.settings;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.MappingViewHolder;
+
+/**
+ * Simple progress indicator that can be used multiple times (if provided with different {@link Item#id}s).
+ */
+public final class SettingProgress {
+
+  public static final class ViewHolder extends MappingViewHolder<SettingProgress.Item> {
+
+    public ViewHolder(@NonNull View itemView) {
+      super(itemView);
+    }
+
+    @Override
+    public void bind(@NonNull SettingProgress.Item model) { }
+  }
+
+  public static final class Item implements MappingModel<SettingProgress.Item> {
+    private final int id;
+
+    public Item() {
+      this(0);
+    }
+
+    public Item(int id) {
+      this.id = id;
+    }
+
+    @Override
+    public boolean areItemsTheSame(@NonNull SettingProgress.Item newItem) {
+      return id == newItem.id;
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull SettingProgress.Item newItem) {
+      return areItemsTheSame(newItem);
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/SingleSelectSetting.java

@@ -1,7 +1,10 @@
 package org.thoughtcrime.securesms.components.settings;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.CheckedTextView;
+import android.widget.RadioButton;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -23,46 +26,62 @@ public class SingleSelectSetting {
 
   public static class ViewHolder extends MappingViewHolder<Item> {
 
+    private final   RadioButton                          radio;
     protected final CheckedTextView                      text;
+    private final   TextView                             summaryText;
     protected final SingleSelectSelectionChangedListener selectionChangedListener;
 
     public ViewHolder(@NonNull View itemView, @NonNull SingleSelectSelectionChangedListener selectionChangedListener) {
       super(itemView);
       this.selectionChangedListener = selectionChangedListener;
+      this.radio                    = findViewById(R.id.single_select_item_radio);
       this.text                     = findViewById(R.id.single_select_item_text);
+      this.summaryText              = findViewById(R.id.single_select_item_summary);
     }
 
     @Override
     public void bind(@NonNull Item model) {
+      radio.setChecked(model.isSelected);
       text.setText(model.text);
-      setChecked(model.isSelected);
+      if (!TextUtils.isEmpty(model.summaryText)) {
+        summaryText.setText(model.summaryText);
+        summaryText.setVisibility(View.VISIBLE);
+      } else {
+        summaryText.setVisibility(View.GONE);
+      }
       itemView.setOnClickListener(v -> selectionChangedListener.onSelectionChanged(model.item));
     }
-
-    protected void setChecked(boolean checked) {
-      text.setChecked(checked);
-    }
   }
 
   public static class Item implements MappingModel<Item> {
-    private final String  text;
     private final Object  item;
+    private final String  text;
+    private final String  summaryText;
     private final boolean isSelected;
 
-    public <T> Item(@NonNull T item, @Nullable String text, boolean isSelected) {
-      this.item       = item;
-      this.text       = text != null ? text : item.toString();
-      this.isSelected = isSelected;
-    }
-
-    public @NonNull String getText() {
-      return text;
+    public <T> Item(@NonNull T item, @Nullable String text, @Nullable String summaryText, boolean isSelected) {
+      this.item        = item;
+      this.summaryText = summaryText;
+      this.text        = text != null ? text : item.toString();
+      this.isSelected  = isSelected;
     }
 
     public @NonNull Object getItem() {
       return item;
     }
 
+    public @Nullable String getText() {
+      return text;
+    }
+
+    public @Nullable String getSummaryText() {
+      return summaryText;
+    }
+
+    public boolean isSelected() {
+      return isSelected;
+    }
+
     @Override
     public boolean areItemsTheSame(@NonNull Item newItem) {
       return item.equals(newItem.item);
@@ -70,7 +89,9 @@ public class SingleSelectSetting {
 
     @Override
     public boolean areContentsTheSame(@NonNull Item newItem) {
-      return Objects.equals(text, newItem.text) && isSelected == newItem.isSelected;
+      return Objects.equals(text, newItem.text)               &&
+             Objects.equals(summaryText, newItem.summaryText) &&
+             isSelected == newItem.isSelected;
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java

@@ -19,7 +19,7 @@ import java.io.InputStream;
 
 public class AttachmentRegionDecoder implements ImageRegionDecoder {
 
-  private static final String TAG = AttachmentRegionDecoder.class.getSimpleName();
+  private static final String TAG = Log.tag(AttachmentRegionDecoder.class);
 
   private SkiaImageRegionDecoder passthrough;
 

app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java

@@ -23,7 +23,7 @@ import org.signal.core.util.logging.Log;
  */
 public class HackyViewPager extends ViewPager {
 
-  private static final String TAG = HackyViewPager.class.getSimpleName();
+  private static final String TAG = Log.tag(HackyViewPager.class);
 
   public HackyViewPager(Context context) {
     super(context);

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

@@ -17,6 +17,7 @@ import androidx.core.widget.ImageViewCompat;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
@@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.AvatarUtil;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.webrtc.RendererCommon;
 
@@ -154,7 +154,7 @@ public class CallParticipantView extends ConstraintLayout {
 
   private boolean isMissingMediaKeys(@NonNull CallParticipant participant) {
     if (missingMediaKeysUpdater != null) {
-      Util.cancelRunnableOnMain(missingMediaKeysUpdater);
+      ThreadUtil.cancelRunnableOnMain(missingMediaKeysUpdater);
       missingMediaKeysUpdater = null;
     }
 
@@ -168,7 +168,7 @@ public class CallParticipantView extends ConstraintLayout {
             setCallParticipant(participant);
           }
         };
-        Util.runOnMainDelayed(missingMediaKeysUpdater, DELAY_SHOWING_MISSING_MEDIA_KEYS - time);
+        ThreadUtil.runOnMainDelayed(missingMediaKeysUpdater, DELAY_SHOWING_MISSING_MEDIA_KEYS - time);
       }
     }
     return false;

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

@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms.contacts;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MergeCursor;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.content.CursorLoader;
+
+import java.util.List;
+
+public abstract class AbstractContactsCursorLoader extends CursorLoader {
+
+  private final String filter;
+
+  protected AbstractContactsCursorLoader(@NonNull Context context, @Nullable String filter) {
+    super(context);
+
+    this.filter = sanitizeFilter(filter);
+  }
+
+  @Override
+  public final Cursor loadInBackground() {
+    List<Cursor> cursorList = TextUtils.isEmpty(filter) ? getUnfilteredResults()
+                                                        : getFilteredResults();
+    if (cursorList.size() > 0) {
+      return new MergeCursor(cursorList.toArray(new Cursor[0]));
+    }
+    return null;
+  }
+
+  protected final String getFilter() {
+    return filter;
+  }
+
+  protected abstract List<Cursor> getUnfilteredResults();
+
+  protected abstract List<Cursor> getFilteredResults();
+
+  private static @NonNull String sanitizeFilter(@Nullable String filter) {
+    if (filter == null) {
+      return "";
+    } else if (filter.startsWith("@")) {
+      return filter.substring(1);
+    } else {
+      return filter;
+    }
+  }
+
+  public interface Factory {
+    @NonNull AbstractContactsCursorLoader create();
+  }
+}

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

@@ -23,28 +23,37 @@ import android.database.MergeCursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
+import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.CursorUtil;
+import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.ArrayList;
 import java.util.Collection;
+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 static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
@@ -65,6 +74,9 @@ public class ContactAccessor {
 
   public static final String PUSH_COLUMN = "push";
 
+  private static final String GIVEN_NAME  = ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME;
+  private static final String FAMILY_NAME = ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME;
+
   private static final ContactAccessor instance = new ContactAccessor();
 
   public static synchronized ContactAccessor getInstance() {
@@ -85,55 +97,42 @@ public class ContactAccessor {
     return results;
   }
 
+  /**
+   * Gets and returns a cursor of data for all contacts, containing both phone number data and
+   * structured name data.
+   *
+   * Cursor rows are ordered as follows:
+   *
+   * <ol>
+   *   <li>Contact Lookup Key</li>
+   *   <li>Mimetype</li>
+   *   <li>id</li>
+   * </ol>
+   *
+   * The lookup key is a fixed value that allows you to verify two rows in the database actually
+   * belong to the same contact, since the contact uri can be unstable (if a sync fails, say.)
+   *
+   * We order by id explicitly here for the same contact sync failure error, which could result in
+   * multiple structured name rows for the same user. By ordering by id DESC, we ensure we get
+   * whatever the latest input data was.
+   *
+   * What this results in is a cursor that looks like:
+   *
+   * Alice phone 1
+   * Alice phone 2
+   * Alice structured name 2
+   * Alice structured name 1
+   * Bob phone 1
+   * ... etc.
+   */
   public Cursor getAllSystemContacts(Context context) {
-    return context.getContentResolver().query(Phone.CONTENT_URI, new String[] {Phone.NUMBER, Phone.DISPLAY_NAME, Phone.LABEL, Phone.PHOTO_URI, Phone._ID, Phone.LOOKUP_KEY, Phone.TYPE}, null, null, null);
-  }
+    Uri      uri        = ContactsContract.Data.CONTENT_URI;
+    String[] projection = SqlUtil.buildArgs(ContactsContract.Data.MIMETYPE, Phone.NUMBER, Phone.DISPLAY_NAME, Phone.LABEL, Phone.PHOTO_URI, Phone._ID, Phone.LOOKUP_KEY, Phone.TYPE, GIVEN_NAME, FAMILY_NAME);
+    String   where      = ContactsContract.Data.MIMETYPE + " IN (?, ?)";
+    String[] args       = SqlUtil.buildArgs(Phone.CONTENT_ITEM_TYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
+    String   orderBy    = Phone.LOOKUP_KEY + " ASC, " + ContactsContract.Data.MIMETYPE + " DESC, " + ContactsContract.CommonDataKinds.Phone._ID + " DESC";
 
-  public boolean isSystemContact(Context context, String number) {
-    Uri      uri        = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
-    String[] projection = new String[]{PhoneLookup.DISPLAY_NAME, PhoneLookup.LOOKUP_KEY,
-                                       PhoneLookup._ID, PhoneLookup.NUMBER};
-    Cursor   cursor     = context.getContentResolver().query(uri, projection, null, null, null);
-
-    try {
-      if (cursor != null && cursor.moveToFirst()) {
-        return true;
-      }
-    } finally {
-      if (cursor != null) cursor.close();
-    }
-
-    return false;
-  }
-
-  public Collection<ContactData> getContactsWithPush(Context context) {
-    final ContentResolver resolver = context.getContentResolver();
-    final String[] inProjection    = new String[]{PhoneLookup._ID, PhoneLookup.DISPLAY_NAME};
-
-    final List<String>           registeredAddresses = Stream.of(DatabaseFactory.getRecipientDatabase(context).getRegistered())
-                                                              .map(Recipient::resolved)
-                                                              .filter(r -> r.getE164().isPresent())
-                                                              .map(Recipient::requireE164)
-                                                              .toList();
-    final Collection<ContactData> lookupData          = new ArrayList<>(registeredAddresses.size());
-
-    for (String registeredAddress : registeredAddresses) {
-      Uri    uri          = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(registeredAddress));
-      Cursor lookupCursor = resolver.query(uri, inProjection, null, null, null);
-
-      try {
-        if (lookupCursor != null && lookupCursor.moveToFirst()) {
-          final ContactData contactData = new ContactData(lookupCursor.getLong(0), lookupCursor.getString(1));
-          contactData.numbers.add(new NumberData("TextSecure", registeredAddress));
-          lookupData.add(contactData);
-        }
-      } finally {
-        if (lookupCursor != null)
-          lookupCursor.close();
-      }
-    }
-
-    return lookupData;
+    return context.getContentResolver().query(uri, projection, where, args, orderBy);
   }
 
   public String getNameFromContact(Context context, Uri uri) {
@@ -160,13 +159,13 @@ public class ContactAccessor {
 
   private ContactData getContactData(Context context, String displayName, long id) {
     ContactData contactData = new ContactData(id, displayName);
-    Cursor numberCursor     = null;
-
-    try {
-      numberCursor = context.getContentResolver().query(Phone.CONTENT_URI, null,
-                                                        Phone.CONTACT_ID + " = ?",
-                                                        new String[] {contactData.id + ""}, null);
 
+    try (Cursor numberCursor = context.getContentResolver().query(Phone.CONTENT_URI,
+                                                                  null,
+                                                                  Phone.CONTACT_ID + " = ?",
+                                                                  new String[] {contactData.id + ""},
+                                                                  null))
+    {
       while (numberCursor != null && numberCursor.moveToNext()) {
         int type         = numberCursor.getInt(numberCursor.getColumnIndexOrThrow(Phone.TYPE));
         String label     = numberCursor.getString(numberCursor.getColumnIndexOrThrow(Phone.LABEL));
@@ -175,9 +174,6 @@ public class ContactAccessor {
 
         contactData.numbers.add(new NumberData(typeLabel, number));
       }
-    } finally {
-      if (numberCursor != null)
-        numberCursor.close();
     }
 
     return contactData;

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

@@ -57,7 +57,7 @@ public class ContactRepository {
     add(new Pair<>(ID_COLUMN, cursor -> CursorUtil.requireLong(cursor, RecipientDatabase.ID)));
 
     add(new Pair<>(NAME_COLUMN, cursor -> {
-      String system  = CursorUtil.requireString(cursor, RecipientDatabase.SYSTEM_DISPLAY_NAME);
+      String system  = CursorUtil.requireString(cursor, RecipientDatabase.SYSTEM_JOINED_NAME);
       String profile = CursorUtil.requireString(cursor, RecipientDatabase.SEARCH_PROFILE_NAME);
 
       return Util.getFirstNonEmpty(system, profile);

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.FromTextView;
@@ -26,7 +27,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
 public class ContactSelectionListItem extends LinearLayout implements RecipientForeverObserver {
 
   @SuppressWarnings("unused")
-  private static final String TAG = ContactSelectionListItem.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactSelectionListItem.class);
 
   private AvatarImageView contactPhotoImage;
   private TextView        numberView;

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

@@ -20,13 +20,8 @@ import android.Manifest;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.database.MergeCursor;
-import android.provider.ContactsContract;
-import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.loader.content.CursorLoader;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
@@ -37,7 +32,6 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.phonenumbers.NumberUtil;
-import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.FeatureFlags;
@@ -51,9 +45,9 @@ import java.util.List;
  *
  * @author Jake McGinty
  */
-public class ContactsCursorLoader extends CursorLoader {
+public class ContactsCursorLoader extends AbstractContactsCursorLoader {
 
-  private static final String TAG = ContactsCursorLoader.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactsCursorLoader.class);
 
   public static final class DisplayMode {
     public static final int FLAG_PUSH            = 1;
@@ -64,60 +58,30 @@ public class ContactsCursorLoader extends CursorLoader {
     public static final int FLAG_BLOCK           = 1 << 5;
     public static final int FLAG_HIDE_GROUPS_V1  = 1 << 5;
     public static final int FLAG_HIDE_NEW        = 1 << 6;
-    public static final int FLAG_ALL             = FLAG_PUSH |  FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS | FLAG_SELF;
+    public static final int FLAG_ALL             = FLAG_PUSH | FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS | FLAG_SELF;
   }
 
-  private static final String[] CONTACT_PROJECTION = new String[]{ContactRepository.ID_COLUMN,
-                                                                  ContactRepository.NAME_COLUMN,
-                                                                  ContactRepository.NUMBER_COLUMN,
-                                                                  ContactRepository.NUMBER_TYPE_COLUMN,
-                                                                  ContactRepository.LABEL_COLUMN,
-                                                                  ContactRepository.CONTACT_TYPE_COLUMN,
-                                                                  ContactRepository.ABOUT_COLUMN};
-
   private static final int RECENT_CONVERSATION_MAX = 25;
 
-  private final String  filter;
   private final int     mode;
   private final boolean recents;
 
   private final ContactRepository contactRepository;
 
-  public ContactsCursorLoader(@NonNull Context context, int mode, String filter, boolean recents)
+  private ContactsCursorLoader(@NonNull Context context, int mode, String filter, boolean recents)
   {
-    super(context);
+    super(context, filter);
 
     if (flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS) && !flagSet(mode, DisplayMode.FLAG_ACTIVE_GROUPS)) {
       throw new AssertionError("Inactive group flag set, but the active group flag isn't!");
     }
 
-    this.filter            = sanitizeFilter(filter);
     this.mode              = mode;
     this.recents           = recents;
     this.contactRepository = new ContactRepository(context);
   }
 
-  @Override
-  public Cursor loadInBackground() {
-    List<Cursor> cursorList = TextUtils.isEmpty(filter) ? getUnfilteredResults()
-                                                        : getFilteredResults();
-    if (cursorList.size() > 0) {
-      return new MergeCursor(cursorList.toArray(new Cursor[0]));
-    }
-    return null;
-  }
-
-  private static @NonNull String sanitizeFilter(@Nullable String filter) {
-    if (filter == null) {
-      return "";
-    } else if (filter.startsWith("@")) {
-      return filter.substring(1);
-    } else {
-      return filter;
-    }
-  }
-
-  private List<Cursor> getUnfilteredResults() {
+  protected final List<Cursor> getUnfilteredResults() {
     ArrayList<Cursor> cursorList = new ArrayList<>();
 
     if (groupsOnly(mode)) {
@@ -131,7 +95,7 @@ public class ContactsCursorLoader extends CursorLoader {
     return cursorList;
   }
 
-  private List<Cursor> getFilteredResults() {
+  protected final List<Cursor> getFilteredResults() {
     ArrayList<Cursor> cursorList = new ArrayList<>();
 
     addContactsSection(cursorList);
@@ -153,7 +117,7 @@ public class ContactsCursorLoader extends CursorLoader {
     Cursor recentConversations = getRecentConversationsCursor();
 
     if (recentConversations.getCount() > 0) {
-      cursorList.add(getRecentsHeaderCursor());
+      cursorList.add(ContactsCursorRows.forRecentsHeader(getContext()));
       cursorList.add(recentConversations);
     }
   }
@@ -162,8 +126,8 @@ public class ContactsCursorLoader extends CursorLoader {
     List<Cursor> contacts = getContactsCursors();
 
     if (!isCursorListEmpty(contacts)) {
-      cursorList.add(getContactsHeaderCursor());
-      cursorList.addAll(getContactsCursors());
+      cursorList.add(ContactsCursorRows.forContactsHeader(getContext()));
+      cursorList.addAll(contacts);
     }
   }
 
@@ -175,7 +139,7 @@ public class ContactsCursorLoader extends CursorLoader {
     Cursor groups = getRecentConversationsCursor(true);
 
     if (groups.getCount() > 0) {
-      cursorList.add(getRecentsHeaderCursor());
+      cursorList.add(ContactsCursorRows.forRecentsHeader(getContext()));
       cursorList.add(groups);
     }
   }
@@ -188,89 +152,28 @@ public class ContactsCursorLoader extends CursorLoader {
     Cursor groups = getGroupsCursor();
 
     if (groups.getCount() > 0) {
-      cursorList.add(getGroupsHeaderCursor());
+      cursorList.add(ContactsCursorRows.forGroupsHeader(getContext()));
       cursorList.add(groups);
     }
   }
 
   private void addNewNumberSection(@NonNull List<Cursor> cursorList) {
-    if (FeatureFlags.usernames() && NumberUtil.isVisuallyValidNumberOrEmail(filter)) {
-      cursorList.add(getPhoneNumberSearchHeaderCursor());
+    if (FeatureFlags.usernames() && NumberUtil.isVisuallyValidNumberOrEmail(getFilter())) {
+      cursorList.add(ContactsCursorRows.forPhoneNumberSearchHeader(getContext()));
       cursorList.add(getNewNumberCursor());
-    } else if (!FeatureFlags.usernames() && NumberUtil.isValidSmsOrEmail(filter)){
-      cursorList.add(getPhoneNumberSearchHeaderCursor());
+    } else if (!FeatureFlags.usernames() && NumberUtil.isValidSmsOrEmail(getFilter())) {
+      cursorList.add(ContactsCursorRows.forPhoneNumberSearchHeader(getContext()));
       cursorList.add(getNewNumberCursor());
     }
   }
 
   private void addUsernameSearchSection(@NonNull List<Cursor> cursorList) {
-    if (FeatureFlags.usernames() && UsernameUtil.isValidUsernameForSearch(filter)) {
-      cursorList.add(getUsernameSearchHeaderCursor());
+    if (FeatureFlags.usernames() && UsernameUtil.isValidUsernameForSearch(getFilter())) {
+      cursorList.add(ContactsCursorRows.forUsernameSearchHeader(getContext()));
       cursorList.add(getUsernameSearchCursor());
     }
   }
 
-  private Cursor getRecentsHeaderCursor() {
-    MatrixCursor recentsHeader = new MatrixCursor(CONTACT_PROJECTION);
-    recentsHeader.addRow(new Object[]{ null,
-                                       getContext().getString(R.string.ContactsCursorLoader_recent_chats),
-                                       "",
-                                       ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                       "",
-                                       ContactRepository.DIVIDER_TYPE,
-                                       "" });
-    return recentsHeader;
-  }
-
-  private Cursor getContactsHeaderCursor() {
-    MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
-    contactsHeader.addRow(new Object[] { null,
-                                         getContext().getString(R.string.ContactsCursorLoader_contacts),
-                                         "",
-                                         ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                         "",
-                                         ContactRepository.DIVIDER_TYPE,
-                                         "" });
-    return contactsHeader;
-  }
-
-  private Cursor getGroupsHeaderCursor() {
-    MatrixCursor groupHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
-    groupHeader.addRow(new Object[]{ null,
-                                     getContext().getString(R.string.ContactsCursorLoader_groups),
-                                     "",
-                                     ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                     "",
-                                     ContactRepository.DIVIDER_TYPE,
-                                     "" });
-    return groupHeader;
-  }
-
-  private Cursor getPhoneNumberSearchHeaderCursor() {
-    MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
-    contactsHeader.addRow(new Object[] { null,
-                                         getContext().getString(R.string.ContactsCursorLoader_phone_number_search),
-                                         "",
-                                         ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                         "",
-                                         ContactRepository.DIVIDER_TYPE,
-                                         "" });
-    return contactsHeader;
-  }
-
-  private Cursor getUsernameSearchHeaderCursor() {
-    MatrixCursor contactsHeader = new MatrixCursor(CONTACT_PROJECTION, 1);
-    contactsHeader.addRow(new Object[] { null,
-                                         getContext().getString(R.string.ContactsCursorLoader_username_search),
-                                         "",
-                                         ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                         "",
-                                         ContactRepository.DIVIDER_TYPE,
-                                         "" });
-    return contactsHeader;
-  }
-
-
   private Cursor getRecentConversationsCursor() {
     return getRecentConversationsCursor(false);
   }
@@ -278,21 +181,12 @@ public class ContactsCursorLoader extends CursorLoader {
   private Cursor getRecentConversationsCursor(boolean groupsOnly) {
     ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(getContext());
 
-    MatrixCursor recentConversations = new MatrixCursor(CONTACT_PROJECTION, RECENT_CONVERSATION_MAX);
+    MatrixCursor recentConversations = ContactsCursorRows.createMatrixCursor(RECENT_CONVERSATION_MAX);
     try (Cursor rawConversations = threadDatabase.getRecentConversationList(RECENT_CONVERSATION_MAX, flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), groupsOnly, hideGroupsV1(mode), !smsEnabled(mode))) {
       ThreadDatabase.Reader reader = threadDatabase.readerFor(rawConversations);
-      ThreadRecord threadRecord;
+      ThreadRecord          threadRecord;
       while ((threadRecord = reader.getNext()) != null) {
-        Recipient recipient = threadRecord.getRecipient();
-        String    stringId  = recipient.isGroup() ? recipient.requireGroupId().toString() : recipient.getE164().transform(PhoneNumberFormatter::prettyPrint).or(recipient.getEmail()).or("");
-
-        recentConversations.addRow(new Object[] { recipient.getId().serialize(),
-                                                  recipient.getDisplayName(getContext()),
-                                                  stringId,
-                                                  ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
-                                                  "",
-                                                  ContactRepository.RECENT_TYPE | (recipient.isRegistered() && !recipient.isForceSmsSelection() ? ContactRepository.PUSH_TYPE : 0),
-                                                  recipient.getCombinedAboutAndEmoji() });
+        recentConversations.addRow(ContactsCursorRows.forRecipient(getContext(), threadRecord.getRecipient()));
       }
     }
     return recentConversations;
@@ -306,56 +200,34 @@ public class ContactsCursorLoader extends CursorLoader {
     }
 
     if (pushEnabled(mode)) {
-      cursorList.add(contactRepository.querySignalContacts(filter, selfEnabled(mode)));
+      cursorList.add(contactRepository.querySignalContacts(getFilter(), selfEnabled(mode)));
     }
 
     if (pushEnabled(mode) && smsEnabled(mode)) {
-      cursorList.add(contactRepository.queryNonSignalContacts(filter));
+      cursorList.add(contactRepository.queryNonSignalContacts(getFilter()));
     } else if (smsEnabled(mode)) {
-      cursorList.add(filterNonPushContacts(contactRepository.queryNonSignalContacts(filter)));
+      cursorList.add(filterNonPushContacts(contactRepository.queryNonSignalContacts(getFilter())));
     }
     return cursorList;
   }
 
   private Cursor getGroupsCursor() {
-    MatrixCursor groupContacts = new MatrixCursor(CONTACT_PROJECTION);
-    try (GroupDatabase.Reader reader = DatabaseFactory.getGroupDatabase(getContext()).getGroupsFilteredByTitle(filter, flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), hideGroupsV1(mode))) {
+    MatrixCursor groupContacts = ContactsCursorRows.createMatrixCursor();
+    try (GroupDatabase.Reader reader = DatabaseFactory.getGroupDatabase(getContext()).getGroupsFilteredByTitle(getFilter(), flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), hideGroupsV1(mode))) {
       GroupDatabase.GroupRecord groupRecord;
       while ((groupRecord = reader.getNext()) != null) {
-        groupContacts.addRow(new Object[] { groupRecord.getRecipientId().serialize(),
-                                            groupRecord.getTitle(),
-                                            groupRecord.getId(),
-                                            ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
-                                            "",
-                                            ContactRepository.NORMAL_TYPE,
-                                            "" });
+        groupContacts.addRow(ContactsCursorRows.forGroup(groupRecord));
       }
     }
     return groupContacts;
   }
 
   private Cursor getNewNumberCursor() {
-    MatrixCursor newNumberCursor = new MatrixCursor(CONTACT_PROJECTION, 1);
-    newNumberCursor.addRow(new Object[] { null,
-                                          getUnknownContactTitle(),
-                                          filter,
-                                          ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
-                                          "\u21e2",
-                                          ContactRepository.NEW_PHONE_TYPE,
-                                          "" });
-    return newNumberCursor;
+    return ContactsCursorRows.forNewNumber(getUnknownContactTitle(), getFilter());
   }
 
   private Cursor getUsernameSearchCursor() {
-    MatrixCursor cursor = new MatrixCursor(CONTACT_PROJECTION, 1);
-    cursor.addRow(new Object[] { null,
-                                 getUnknownContactTitle(),
-                                 filter,
-                                 ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
-                                 "\u21e2",
-                                 ContactRepository.NEW_USERNAME_TYPE,
-                                 "" });
-    return cursor;
+    return ContactsCursorRows.forUsernameSearch(getUnknownContactTitle(), getFilter());
   }
 
   private String getUnknownContactTitle() {
@@ -370,20 +242,14 @@ public class ContactsCursorLoader extends CursorLoader {
 
   private @NonNull Cursor filterNonPushContacts(@NonNull Cursor cursor) {
     try {
-      final long startMillis = System.currentTimeMillis();
-      final MatrixCursor matrix = new MatrixCursor(CONTACT_PROJECTION);
+      final long         startMillis = System.currentTimeMillis();
+      final MatrixCursor matrix      = ContactsCursorRows.createMatrixCursor();
       while (cursor.moveToNext()) {
         final RecipientId id        = RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ContactRepository.ID_COLUMN)));
         final Recipient   recipient = Recipient.resolved(id);
 
         if (recipient.resolve().getRegistered() != RecipientDatabase.RegisteredState.REGISTERED) {
-          matrix.addRow(new Object[]{cursor.getLong(cursor.getColumnIndexOrThrow(ContactRepository.ID_COLUMN)),
-                                     cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.NAME_COLUMN)),
-                                     cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.NUMBER_COLUMN)),
-                                     cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.NUMBER_TYPE_COLUMN)),
-                                     cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.LABEL_COLUMN)),
-                                     ContactRepository.NORMAL_TYPE,
-                                     "" });
+          matrix.addRow(ContactsCursorRows.forNonPushContact(cursor));
         }
       }
       Log.i(TAG, "filterNonPushContacts() -> " + (System.currentTimeMillis() - startMillis) + "ms");
@@ -440,4 +306,24 @@ public class ContactsCursorLoader extends CursorLoader {
   private static boolean flagSet(int mode, int flag) {
     return (mode & flag) > 0;
   }
+
+  public static class Factory implements AbstractContactsCursorLoader.Factory {
+
+    private final Context context;
+    private final int     displayMode;
+    private final String  cursorFilter;
+    private final boolean displayRecents;
+
+    public Factory(Context context, int displayMode, String cursorFilter, boolean displayRecents) {
+      this.context        = context;
+      this.displayMode    = displayMode;
+      this.cursorFilter   = cursorFilter;
+      this.displayRecents = displayRecents;
+    }
+
+    @Override
+    public @NonNull AbstractContactsCursorLoader create() {
+      return new ContactsCursorLoader(context, displayMode, cursorFilter, displayRecents);
+    }
+  }
 }

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

@@ -0,0 +1,153 @@
+package org.thoughtcrime.securesms.contacts;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.provider.ContactsContract;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
+import org.thoughtcrime.securesms.recipients.Recipient;
+
+/**
+ * Helper utility for generating cursors and cursor rows for subclasses of {@link AbstractContactsCursorLoader}.
+ */
+public final class ContactsCursorRows {
+
+  private static final String[] CONTACT_PROJECTION = new String[]{ContactRepository.ID_COLUMN,
+                                                                  ContactRepository.NAME_COLUMN,
+                                                                  ContactRepository.NUMBER_COLUMN,
+                                                                  ContactRepository.NUMBER_TYPE_COLUMN,
+                                                                  ContactRepository.LABEL_COLUMN,
+                                                                  ContactRepository.CONTACT_TYPE_COLUMN,
+                                                                  ContactRepository.ABOUT_COLUMN};
+
+  /**
+   * Create a {@link MatrixCursor} with the proper projection for a subclass of {@link AbstractContactsCursorLoader}
+   */
+  public static @NonNull MatrixCursor createMatrixCursor() {
+    return new MatrixCursor(CONTACT_PROJECTION);
+  }
+
+  /**
+   * Create a {@link MatrixCursor} with the proper projection for a subclass of {@link AbstractContactsCursorLoader}
+   *
+   * @param initialCapacity The initial capacity to hand to the {@link MatrixCursor}
+   */
+  public static @NonNull MatrixCursor createMatrixCursor(int initialCapacity) {
+    return new MatrixCursor(CONTACT_PROJECTION, initialCapacity);
+  }
+
+  /**
+   * Create a row for a contacts cursor based off the given recipient.
+   */
+  public static @NonNull Object[] forRecipient(@NonNull Context context, @NonNull Recipient recipient) {
+    String stringId = recipient.isGroup() ? recipient.requireGroupId().toString()
+                                          : recipient.getE164().transform(PhoneNumberFormatter::prettyPrint).or(recipient.getEmail()).or("");
+
+    return new Object[]{recipient.getId().serialize(),
+                        recipient.getDisplayName(context),
+                        stringId,
+                        ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
+                        "",
+                        ContactRepository.RECENT_TYPE | (recipient.isRegistered() && !recipient.isForceSmsSelection() ? ContactRepository.PUSH_TYPE : 0),
+                        recipient.getCombinedAboutAndEmoji()};
+  }
+
+  /**
+   * Create a row for a contacts cursor based off the given system contact.
+   */
+  public static @NonNull Object[] forNonPushContact(@NonNull Cursor systemContactCursor) {
+    return new Object[]{systemContactCursor.getLong(systemContactCursor.getColumnIndexOrThrow(ContactRepository.ID_COLUMN)),
+                        systemContactCursor.getString(systemContactCursor.getColumnIndexOrThrow(ContactRepository.NAME_COLUMN)),
+                        systemContactCursor.getString(systemContactCursor.getColumnIndexOrThrow(ContactRepository.NUMBER_COLUMN)),
+                        systemContactCursor.getString(systemContactCursor.getColumnIndexOrThrow(ContactRepository.NUMBER_TYPE_COLUMN)),
+                        systemContactCursor.getString(systemContactCursor.getColumnIndexOrThrow(ContactRepository.LABEL_COLUMN)),
+                        ContactRepository.NORMAL_TYPE,
+                        ""};
+  }
+
+  /**
+   * Create a row for a contacts cursor based off the given group record.
+   */
+  public static @NonNull Object[] forGroup(@NonNull GroupDatabase.GroupRecord groupRecord) {
+    return new Object[]{groupRecord.getRecipientId().serialize(),
+                        groupRecord.getTitle(),
+                        groupRecord.getId(),
+                        ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
+                        "",
+                        ContactRepository.NORMAL_TYPE,
+                        ""};
+  }
+
+  /**
+   * Create a row for a contacts cursor for a new number the user is entering or has entered.
+   */
+  public static @NonNull MatrixCursor forNewNumber(@NonNull String unknownContactTitle, @NonNull String filter) {
+    MatrixCursor matrixCursor = createMatrixCursor(1);
+
+    matrixCursor.addRow(new Object[]{null,
+                                     unknownContactTitle,
+                                     filter,
+                                     ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
+                                     "\u21e2",
+                                     ContactRepository.NEW_PHONE_TYPE,
+                                     ""});
+
+    return matrixCursor;
+  }
+
+  /**
+   * Create a row for a contacts cursor for a username the user is entering or has entered.
+   */
+  public static @NonNull MatrixCursor forUsernameSearch(@NonNull String unknownContactTitle, @NonNull String filter) {
+    MatrixCursor matrixCursor = createMatrixCursor(1);
+
+    matrixCursor.addRow(new Object[]{null,
+                                     unknownContactTitle,
+                                     filter,
+                                     ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
+                                     "\u21e2",
+                                     ContactRepository.NEW_USERNAME_TYPE,
+                                     ""});
+
+    return matrixCursor;
+  }
+
+  public static @NonNull MatrixCursor forUsernameSearchHeader(@NonNull Context context) {
+    return forHeader(context.getString(R.string.ContactsCursorLoader_username_search));
+  }
+
+  public static @NonNull MatrixCursor forPhoneNumberSearchHeader(@NonNull Context context) {
+    return forHeader(context.getString(R.string.ContactsCursorLoader_phone_number_search));
+  }
+
+  public static @NonNull MatrixCursor forGroupsHeader(@NonNull Context context) {
+    return forHeader(context.getString(R.string.ContactsCursorLoader_groups));
+  }
+
+  public static @NonNull MatrixCursor forRecentsHeader(@NonNull Context context) {
+    return forHeader(context.getString(R.string.ContactsCursorLoader_recent_chats));
+  }
+
+  public static @NonNull MatrixCursor forContactsHeader(@NonNull Context context) {
+    return forHeader(context.getString(R.string.ContactsCursorLoader_contacts));
+  }
+
+  public static @NonNull MatrixCursor forHeader(@NonNull String name) {
+    MatrixCursor matrixCursor = createMatrixCursor(1);
+
+    matrixCursor.addRow(new Object[]{null,
+                                     name,
+                                     "",
+                                     ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
+                                     "",
+                                     ContactRepository.DIVIDER_TYPE,
+                                     ""});
+
+    return matrixCursor;
+  }
+}

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

@@ -51,7 +51,7 @@ import java.util.Set;
  */
 public class ContactsDatabase {
 
-  private static final String TAG              = ContactsDatabase.class.getSimpleName();
+  private static final String TAG              = Log.tag(ContactsDatabase.class);
   private static final String CONTACT_MIMETYPE = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact";
   private static final String CALL_MIMETYPE    = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call";
   private static final String SYNC             = "__TS";

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

@@ -7,15 +7,29 @@ import android.content.Context;
 import android.content.SyncResult;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+
+import com.annimon.stream.Stream;
+
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
 
-  private static final String TAG = ContactsSyncAdapter.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactsSyncAdapter.class);
+
+  private static final int FULL_SYNC_THRESHOLD = 10;
 
   public ContactsSyncAdapter(Context context, boolean autoInitialize) {
     super(context, autoInitialize);
@@ -27,12 +41,40 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
   {
     Log.i(TAG, "onPerformSync(" + authority +")");
 
-    if (TextSecurePreferences.isPushRegistered(getContext())) {
+    Context context = getContext();
+
+    if (!TextSecurePreferences.isPushRegistered(context)) {
+      Log.i(TAG, "Not push registered. Just syncing contact info.");
+      DirectoryHelper.syncRecipientInfoWithSystemContacts(context);
+      return;
+    }
+
+    Set<String> allSystemNumbers     = ContactAccessor.getInstance().getAllContactsWithNumbers(context);
+    Set<String> knownSystemNumbers   = DatabaseFactory.getRecipientDatabase(context).getAllPhoneNumbers();
+    Set<String> unknownSystemNumbers = SetUtil.difference(allSystemNumbers, knownSystemNumbers);
+
+    if (unknownSystemNumbers.size() > FULL_SYNC_THRESHOLD) {
+      Log.i(TAG, "There are " + unknownSystemNumbers.size() + " unknown contacts. Doing a full sync.");
       try {
-        DirectoryHelper.refreshDirectory(getContext(), true);
+        DirectoryHelper.refreshDirectory(context, true);
       } catch (IOException e) {
         Log.w(TAG, e);
       }
+    } else if (unknownSystemNumbers.size() > 0) {
+      Log.i(TAG, "There are " + unknownSystemNumbers.size() + " unknown contacts. Doing an individual sync.");
+      List<Recipient> recipients = Stream.of(unknownSystemNumbers)
+                                         .filter(s -> s.startsWith("+"))
+                                         .map(s -> Recipient.external(getContext(), s))
+                                         .toList();
+      try {
+        DirectoryHelper.refreshDirectoryFor(context, recipients, true);
+      } catch (IOException e) {
+        Log.w(TAG, "Failed to refresh! Scheduling for later.", e);
+        ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true));
+      }
+    } else {
+      Log.i(TAG, "No new contacts. Just syncing system contact data.");
+      DirectoryHelper.syncRecipientInfoWithSystemContacts(context);
     }
   }
 

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

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.contacts.sync;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.profiles.ProfileName;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.LinkedList;
+import java.util.List;
+
+final class ContactHolder {
+
+  private static final String TAG = Log.tag(ContactHolder.class);
+
+  private final String                  lookupKey;
+  private final List<PhoneNumberRecord> phoneNumberRecords = new LinkedList<>();
+
+  private StructuredNameRecord structuredNameRecord;
+
+  ContactHolder(@NonNull String lookupKey) {
+    this.lookupKey = lookupKey;
+  }
+
+  @NonNull String getLookupKey() {
+    return lookupKey;
+  }
+
+  public void addPhoneNumberRecord(@NonNull PhoneNumberRecord phoneNumberRecord) {
+    phoneNumberRecords.add(phoneNumberRecord);
+  }
+
+  public void setStructuredNameRecord(@NonNull StructuredNameRecord structuredNameRecord) {
+    this.structuredNameRecord = structuredNameRecord;
+  }
+
+  void commit(@NonNull RecipientDatabase.BulkOperationsHandle handle) {
+    for (PhoneNumberRecord phoneNumberRecord : phoneNumberRecords) {
+      handle.setSystemContactInfo(phoneNumberRecord.getRecipientId(),
+                                  getProfileName(phoneNumberRecord.getDisplayName()),
+                                  phoneNumberRecord.getDisplayName(),
+                                  phoneNumberRecord.getContactPhotoUri(),
+                                  phoneNumberRecord.getContactLabel(),
+                                  phoneNumberRecord.getPhoneType(),
+                                  Optional.fromNullable(phoneNumberRecord.getContactUri()).transform(Uri::toString).orNull());
+    }
+  }
+
+  private @NonNull ProfileName getProfileName(@Nullable String displayName) {
+    if (structuredNameRecord != null && structuredNameRecord.hasGivenName()) {
+      return structuredNameRecord.asProfileName();
+    } else if (displayName != null) {
+      return ProfileName.asGiven(displayName);
+    } else {
+      Log.w(TAG, "Failed to find a suitable display name!");
+      return ProfileName.EMPTY;
+    }
+  }
+}

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

@@ -7,7 +7,6 @@ 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;
@@ -43,6 +42,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.ProfileUtil;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
@@ -63,6 +63,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -208,6 +209,13 @@ public class DirectoryHelper {
     return newRegisteredState;
   }
 
+  /**
+   * Reads the system contacts and copies over any matching data (like names) int our local store.
+   */
+  public static void syncRecipientInfoWithSystemContacts(@NonNull Context context) {
+    syncRecipientInfoWithSystemContacts(context, Collections.emptyMap());
+  }
+
   @WorkerThread
   private static void refreshNumbers(@NonNull Context context, @NonNull Set<String> databaseNumbers, @NonNull Set<String> systemNumbers, boolean notifyOfNewUsers) throws IOException {
     RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
@@ -309,59 +317,117 @@ public class DirectoryHelper {
     }
 
     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  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);
-          }
-        }
-      }
+      syncRecipientInfoWithSystemContacts(context, rewrites);
     } catch (RemoteException | OperationApplicationException e) {
       Log.w(TAG, "Failed to update contacts.", e);
     }
   }
 
+  private static void syncRecipientInfoWithSystemContacts(@NonNull Context context, @NonNull Map<String, String> rewrites) {
+    RecipientDatabase     recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    BulkOperationsHandle  handle            = recipientDatabase.beginBulkSystemContactUpdate();
+
+    try (Cursor cursor = ContactAccessor.getInstance().getAllSystemContacts(context)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String mimeType = getMimeType(cursor);
+
+        if (!isPhoneMimeType(mimeType)) {
+          Log.w(TAG, "Ignoring unwanted mime type: " + mimeType);
+          continue;
+        }
+
+        String        lookupKey     = getLookupKey(cursor);
+        ContactHolder contactHolder = new ContactHolder(lookupKey);
+
+        while (!cursor.isAfterLast() && getLookupKey(cursor).equals(lookupKey) && isPhoneMimeType(getMimeType(cursor))) {
+          String number = CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.NUMBER);
+
+          if (isValidContactNumber(number)) {
+            String formattedNumber = PhoneNumberFormatter.get(context).format(number);
+            String realNumber      = Util.getFirstNonEmpty(rewrites.get(formattedNumber), formattedNumber);
+
+            PhoneNumberRecord.Builder builder = new PhoneNumberRecord.Builder();
+
+            builder.withRecipientId(Recipient.externalContact(context, realNumber).getId());
+            builder.withDisplayName(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+            builder.withContactPhotoUri(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.PHOTO_URI));
+            builder.withContactLabel(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.LABEL));
+            builder.withPhoneType(CursorUtil.requireInt(cursor, ContactsContract.CommonDataKinds.Phone.TYPE));
+            builder.withContactUri(ContactsContract.Contacts.getLookupUri(CursorUtil.requireLong(cursor, ContactsContract.CommonDataKinds.Phone._ID),
+                CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY)));
+
+            contactHolder.addPhoneNumberRecord(builder.build());
+          } else {
+            Log.w(TAG, "Skipping phone entry with invalid number");
+          }
+
+          cursor.moveToNext();
+        }
+
+        if (!cursor.isAfterLast() && getLookupKey(cursor).equals(lookupKey)) {
+          if (isStructuredNameMimeType(getMimeType(cursor))) {
+            StructuredNameRecord.Builder builder = new StructuredNameRecord.Builder();
+
+            builder.withGivenName(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME));
+            builder.withFamilyName(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME));
+
+            contactHolder.setStructuredNameRecord(builder.build());
+          } else {
+            Log.i(TAG, "Skipping invalid mimeType " + mimeType);
+          }
+        } else {
+          Log.i(TAG, "No structured name for user, rolling back cursor.");
+          cursor.moveToPrevious();
+        }
+
+        contactHolder.commit(handle);
+      }
+    } catch (IllegalStateException e) {
+      Log.w(TAG, "Hit an issue with the cursor while reading!", e);
+    } 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);
+        }
+      }
+    }
+  }
+
+  private static boolean isPhoneMimeType(@NonNull String mimeType) {
+    return ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(mimeType);
+  }
+
+  private static boolean isStructuredNameMimeType(@NonNull String mimeType) {
+    return ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE.equals(mimeType);
+  }
+
   private static boolean isValidContactNumber(@Nullable String number) {
     return !TextUtils.isEmpty(number) && !UuidUtil.isUuid(number);
   }
 
+  private static @NonNull String getLookupKey(@NonNull Cursor cursor) {
+    return Objects.requireNonNull(CursorUtil.requireString(cursor, ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY));
+  }
+
+  private static @NonNull String getMimeType(@NonNull Cursor cursor) {
+    return CursorUtil.requireString(cursor, ContactsContract.Data.MIMETYPE);
+  }
+
   private static @Nullable AccountHolder getOrCreateSystemAccount(Context context) {
     AccountManager accountManager = AccountManager.get(context);
     Account[]      accounts       = accountManager.getAccountsByType(BuildConfig.APPLICATION_ID);

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

@@ -0,0 +1,99 @@
+package org.thoughtcrime.securesms.contacts.sync;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+import java.util.Objects;
+
+/**
+ * Represents all the data we pull from a Phone data cursor row from the contacts database.
+ */
+final class PhoneNumberRecord {
+
+  private final RecipientId recipientId;
+  private final String      displayName;
+  private final String      contactPhotoUri;
+  private final String      contactLabel;
+  private final int         phoneType;
+  private final Uri         contactUri;
+
+  private PhoneNumberRecord(@NonNull PhoneNumberRecord.Builder builder) {
+    recipientId     = Objects.requireNonNull(builder.recipientId);
+    displayName     = builder.displayName;
+    contactPhotoUri = builder.contactPhotoUri;
+    contactLabel    = builder.contactLabel;
+    phoneType       = builder.phoneType;
+    contactUri      = builder.contactUri;
+  }
+
+  @NonNull RecipientId getRecipientId() {
+    return recipientId;
+  }
+
+  @Nullable String getDisplayName() {
+    return displayName;
+  }
+
+  @Nullable String getContactPhotoUri() {
+    return contactPhotoUri;
+  }
+
+  @Nullable String getContactLabel() {
+    return contactLabel;
+  }
+
+  int getPhoneType() {
+    return phoneType;
+  }
+
+  @Nullable Uri getContactUri() {
+    return contactUri;
+  }
+
+  final static class Builder {
+    private RecipientId recipientId;
+    private String      displayName;
+    private String      contactPhotoUri;
+    private String      contactLabel;
+    private int         phoneType;
+    private Uri         contactUri;
+
+    @NonNull Builder withRecipientId(@NonNull RecipientId recipientId) {
+      this.recipientId = recipientId;
+      return this;
+    }
+
+    @NonNull Builder withDisplayName(@Nullable String displayName) {
+      this.displayName = displayName;
+      return this;
+    }
+
+    @NonNull Builder withContactUri(@Nullable Uri contactUri) {
+      this.contactUri = contactUri;
+      return this;
+    }
+
+    @NonNull Builder withContactLabel(@NonNull String contactLabel) {
+      this.contactLabel = contactLabel;
+      return this;
+    }
+
+    @NonNull Builder withContactPhotoUri(@NonNull String contactPhotoUri) {
+      this.contactPhotoUri = contactPhotoUri;
+      return this;
+    }
+
+    @NonNull Builder withPhoneType(int phoneType) {
+      this.phoneType = phoneType;
+      return this;
+    }
+
+    @NonNull PhoneNumberRecord build() {
+      return new PhoneNumberRecord(this);
+    }
+  }
+}

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

@@ -0,0 +1,46 @@
+package org.thoughtcrime.securesms.contacts.sync;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.profiles.ProfileName;
+
+/**
+ * Represents the data pulled from a StructuredName row of a Contacts data cursor.
+ */
+final class StructuredNameRecord {
+  private final String givenName;
+  private final String familyName;
+
+  StructuredNameRecord(@NonNull StructuredNameRecord.Builder builder) {
+    this.givenName  = builder.givenName;
+    this.familyName = builder.familyName;
+  }
+
+  public boolean hasGivenName() {
+    return givenName != null;
+  }
+
+  public @NonNull ProfileName asProfileName() {
+    return ProfileName.fromParts(givenName, familyName);
+  }
+
+  final static class Builder {
+    private String givenName;
+    private String familyName;
+
+    @NonNull Builder withGivenName(@Nullable String givenName) {
+      this.givenName = givenName;
+      return this;
+    }
+
+    @NonNull Builder withFamilyName(@Nullable String familyName) {
+      this.familyName = familyName;
+      return this;
+    }
+
+    @NonNull StructuredNameRecord build() {
+      return new StructuredNameRecord(this);
+    }
+  }
+}