Bump version to 4.55.5

This reverts commit ed2b049ad4.

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: Android CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

README.md

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

app/.tx/config

@@ -3,8 +3,8 @@ host = https://www.transifex.com
 lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
 
 [signal-android.master]
-file_filter = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
+file_filter = src/main/res/values-<lang>/strings.xml
+source_file = src/main/res/values/strings.xml
 source_lang = en
 type = ANDROID
 

app/build.gradle

@@ -117,7 +117,9 @@ dependencies {
 
     implementation project(':libsignal-service')
 
-    implementation 'org.signal:ringrtc-android:0.2.0'
+    implementation 'org.signal:argon2:13.1@aar'
+
+    implementation 'org.signal:ringrtc-android:0.3.3'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -175,27 +177,19 @@ dependencies {
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
 
     testImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
-    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
-        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
     testImplementation 'org.robolectric:robolectric:4.2'
     testImplementation 'org.robolectric:shadows-multidex:4.2'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 dependencyVerification {
     configuration = '(play|website)(Debug|Release)RuntimeClasspath'
 }
 
-def canonicalVersionCode = 578
-def canonicalVersionName = "4.51.5"
+def canonicalVersionCode = 602
+def canonicalVersionName = "4.55.5"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -234,11 +228,10 @@ android {
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
-        buildConfigField "String", "USER_AGENT", "\"OWA\""
-        buildConfigField "boolean", "DEV_BUILD", "false"
+        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
         buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
-        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"f2e2a5004794a6c1bac5c4949eadbc243dd02e02d1a93f10fe24584fb70815d8\""
-        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"f51f435802ada769e67aaf5744372bb7e7d519eecf996d335eb5b46b872b5789\""
+        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
+        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
@@ -257,6 +250,8 @@ android {
                 universalApk true
             }
         }
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
@@ -308,7 +303,7 @@ android {
             buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
             buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
             buildConfigField "String", "MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
-            buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"b5a865941f95887018c86725cc92308d34a3084dc2b4e7bd2de5e5e1690b50c6\""
+            buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"a1e9c1d3f352b5c4f0fc7a421b98119e60e5ff703c28fbea85c66bfa7306deab\""
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
         }
         release {
@@ -345,32 +340,6 @@ android {
         }
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile '../AndroidManifest.xml'
-            java.srcDirs = ['../src']
-            resources.srcDirs = ['../src']
-            aidl.srcDirs = ['../src']
-            renderscript.srcDirs = ['../src']
-            res.srcDirs = ['../res']
-            assets.srcDirs = ['../assets']
-            jniLibs.srcDirs = ['../libs']
-            proto.srcDir '../protobuf'
-        }
-        androidTest {
-            java.srcDirs = ['../test/androidTest/java']
-        }
-        test {
-            java.srcDirs = ['../test/unitTest/java']
-            resources.srcDirs = ['../test/unitTest/resources']
-        }
-        staging {
-            res.srcDirs = ['../staging/res']
-        }
-
-        website.manifest.srcFile '../website/AndroidManifest.xml'
-    }
-
     lintOptions {
         abortOnError true
         baseline file("lint-baseline.xml")

app/lint-baseline.xml

@@ -7,7 +7,7 @@
         errorLine1="    List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
             line="101"
             column="35"/>
     </issue>
@@ -18,7 +18,7 @@
         errorLine1="                drawables.getColor(1, 0xff000000);"
         errorLine2="                                   ~">
         <location
-            file="src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
             line="187"
             column="36"/>
     </issue>

app/src/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java

@@ -0,0 +1,93 @@
+package org.thoughtcrime.securesms.lock;
+
+import org.junit.Test;
+import org.thoughtcrime.securesms.util.Hex;
+import org.whispersystems.signalservice.api.kbs.HashedPin;
+import org.whispersystems.signalservice.api.kbs.KbsData;
+import org.whispersystems.signalservice.api.kbs.MasterKey;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public final class PinHashing_hashPin_Test {
+
+  @Test
+  public void argon2_hashed_pin_password() throws IOException {
+    String    pin       = "password";
+    byte[]    backupId  = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("ab7e8499d21f80a6600b3b9ee349ac6d72c07e3359fe885a934ba7aa844429f8"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("3f33ce58eb25b40436592a30eae2a8fabab1899095f4e2fba6e2d0dc43b4a2d9cac5a3931748522393951e0e54dec769"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_another_password() throws IOException {
+    String    pin       = "anotherpassword";
+    byte[]    backupId  = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("88a787415a2ecd79da0d1016a82a27c5c695c9a19b88b0aa1d35683280aa9a67"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("301d9dd1e96f20ce51083f67d3298fd37b97525de8324d5e12ed2d407d3d927b"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("9d9b05402ea39c17ff1c9298c8a0e86784a352aa02a74943bf8bcf07ec0f4b574a5b786ad0182c8d308d9eb06538b8c9"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_password_with_spaces_diacritics_and_non_arabic_numerals() throws IOException {
+    String    pin       = " Pass६örd ";
+    byte[]    backupId  = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("9571f3fde1e58588ba49bcf82be1b301ca3859a6f59076f79a8f47181ef952bf"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("ab645acdccc1652a48a34b2ac6926340ff35c03034013f68760f20013f028dd8"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("11c0ba1834db15e47c172f6c987c64bd4cfc69c6047dd67a022afeec0165a10943f204d5b8f37b3cb7bab21c6dfc39c8"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    assertEquals("577939bccb2b6638c39222d5a97998a867c5e154e30b82cc120f2dd07a3de987", kbsData.getMasterKey().deriveRegistrationLock());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+
+  @Test
+  public void argon2_hashed_pin_password_with_just_non_arabic_numerals() throws IOException {
+    String    pin       = " ६१८ ";
+    byte[]    backupId  = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
+    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("0432d735b32f66d0e3a70d4f9cc821a8529521a4937d26b987715d8eff4e4c54"));
+
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
+
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("d2fedabd0d4c17a371491c9722578843a26be3b4923e28d452ab2fc5491e794b"), kbsData.getKbsAccessKey());
+    assertArrayEquals(Hex.fromStringCondensed("877ef871ef1fc668401c717ef21aa12e8523579fb1ff4474b76f28c2293537c80cc7569996c9e0229bea7f378e3a824e"), kbsData.getCipherText());
+    assertEquals(masterKey, kbsData.getMasterKey());
+
+    assertEquals("23a75cb1df1a87df45cc2ed167c2bdc85ab1220b847c88761b0005cac907fce5", kbsData.getMasterKey().deriveRegistrationLock());
+
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
+  }
+}

app/src/main/AndroidManifest.xml

@@ -188,6 +188,14 @@
             <data android:scheme="sgnl"
                   android:host="addstickers" />
         </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https"
+                  android:host="signal.art"
+                  android:pathPrefix="/addstickers"/>
+        </intent-filter>
     </activity>
 
     <activity-alias android:name=".RoutingActivity"
@@ -248,7 +256,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ExperienceUpgradeActivity"
-              android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -394,27 +402,33 @@
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".scribbles.StickerSelectActivity"
-              android:theme="@style/TextSecure.DarkTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.NewStickerSelectActivity"
+    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
               android:theme="@style/TextSecure.DarkTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
               android:theme="@style/TextSecure.DarkTheme"/>
 
-    <activity android:name=".CreateProfileActivity"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name=".profiles.edit.EditProfileActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:windowSoftInputMode="stateVisible"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".lock.v2.CreateKbsPinActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".lock.v2.KbsMigrationActivity"
+            android:theme="@style/TextSecure.LightRegistrationTheme"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ClearProfileAvatarActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:icon="@drawable/clear_profile_avatar"
-              android:label="@string/AndroidManifest_remove_photo">
+            android:theme="@style/Theme.AppCompat.Dialog.Alert"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:icon="@drawable/clear_profile_avatar"
+            android:label="@string/AndroidManifest_remove_photo">
 
         <intent-filter>
             <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
@@ -445,11 +459,6 @@
             android:theme="@style/TextSecure.LightNoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity
-        android:name=".usernames.ProfileEditActivityV2"
-        android:theme="@style/TextSecure.LightNoActionBar"
-        android:windowSoftInputMode="adjustResize"/>
-
     <activity android:name=".MainActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"

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

@@ -37,6 +37,7 @@ import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.ringrtc.CallConnectionFactory;
 import org.thoughtcrime.securesms.components.TypingStatusRepository;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
@@ -47,11 +48,14 @@ import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger;
+import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
@@ -68,8 +72,11 @@ import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
-import org.thoughtcrime.securesms.util.FrameRateTracker;
+import org.thoughtcrime.securesms.stickers.BlessedPacks;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
@@ -112,8 +119,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeSecurityProvider();
     initializeLogging();
     initializeCrashHandling();
-    initializeFirstEverAppLaunch();
     initializeAppDependencies();
+    initializeFirstEverAppLaunch();
     initializeApplicationMigrations();
     initializeMessageRetrieval();
     initializeExpiringMessageManager();
@@ -127,7 +134,9 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeRingRtc();
     initializePendingMessages();
     initializeBlobProvider();
+    initializeCleanup();
     initializeCameraX();
+    FeatureFlags.init();
     NotificationChannels.create(this);
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
@@ -142,10 +151,12 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   public void onStart(@NonNull LifecycleOwner owner) {
     isAppVisible = true;
     Log.i(TAG, "App is now visible.");
+    FeatureFlags.refresh();
     ApplicationDependencies.getRecipientCache().warmUp();
     executePendingContactSync();
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
+    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
   }
 
   @Override
@@ -214,7 +225,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   private void initializeCrashHandling() {
     final Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
-    Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionLogger(originalHandler));
+    Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
   }
 
   private void initializeApplicationMigrations() {
@@ -237,6 +248,12 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         InsightsOptOut.userRequestedOptOut(this);
         TextSecurePreferences.setAppMigrationVersion(this, ApplicationMigrations.CURRENT_VERSION);
         TextSecurePreferences.setJobManagerVersion(this, JobManager.CURRENT_VERSION);
+        TextSecurePreferences.setLastExperienceVersionCode(this, Util.getCanonicalVersionCode());
+        TextSecurePreferences.setHasSeenStickerIntroTooltip(this, true);
+        ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+        SignalStore.registrationValues().onNewInstall();
+        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
       }
 
       Log.i(TAG, "Setting first install version to " + BuildConfig.CANONICAL_VERSION_CODE);
@@ -297,6 +314,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         add("Moto G4");
         add("TA-1053");
         add("Mi A1");
+        add("Mi A2");
         add("E5823"); // Sony z5 compact
         add("Redmi Note 5");
         add("FP2"); // Fairphone FP2
@@ -360,11 +378,18 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   private void initializeBlobProvider() {
-    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+    SignalExecutors.BOUNDED.execute(() -> {
       BlobProvider.getInstance().onSessionStart(this);
     });
   }
 
+  private void initializeCleanup() {
+    SignalExecutors.BOUNDED.execute(() -> {
+      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    });
+  }
+
   @SuppressLint("RestrictedApi")
   private void initializeCameraX() {
     if (CameraXUtil.isSupported()) {

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

@@ -38,11 +38,10 @@ import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.StoragePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.usernames.ProfileEditActivityV2;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
@@ -266,14 +265,12 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     private class ProfileClickListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        if (FeatureFlags.USERNAMES) {
-          requireActivity().startActivity(ProfileEditActivityV2.getLaunchIntent(requireContext()));
-        } else {
-          Intent intent = new Intent(preference.getContext(), CreateProfileActivity.class);
-          intent.putExtra(CreateProfileActivity.EXCLUDE_SYSTEM, true);
+        Intent intent = new Intent(preference.getContext(), EditProfileActivity.class);
+        intent.putExtra(EditProfileActivity.EXCLUDE_SYSTEM, true);
+        intent.putExtra(EditProfileActivity.DISPLAY_USERNAME, true);
+        intent.putExtra(EditProfileActivity.NEXT_BUTTON_TEXT, R.string.save);
 
-          requireActivity().startActivity(intent);
-        }
+        requireActivity().startActivity(intent);
         return true;
       }
     }

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

@@ -36,8 +36,8 @@ public class BasicIntroFragment extends Fragment {
     super.onCreate(savedInstanceState);
     if (getArguments() != null) {
       drawable = getArguments().getInt(ARG_DRAWABLE);
-      text     = getArguments().getInt(ARG_TEXT    );
-      subtext  = getArguments().getInt(ARG_SUBTEXT );
+      text     = getArguments().getInt(ARG_TEXT);
+      subtext  = getArguments().getInt(ARG_SUBTEXT);
     }
   }
 

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

@@ -5,12 +5,13 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import androidx.appcompat.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
@@ -20,13 +21,12 @@ import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.PushDecryptJob;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.VerifySpan;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -179,7 +179,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
 
             long pushId = pushDatabase.insert(envelope);
 
-            ApplicationDependencies.getJobManager().add(new PushDecryptJob(getContext(), pushId, messageRecord.getId()));
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
           } catch (IOException e) {
             throw new AssertionError(e);
           }

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

@@ -7,19 +7,24 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.viewpager.widget.ViewPager;
-import android.view.View;
 
 import com.melnykov.fab.FloatingActionButton;
-import com.nineoldandroids.animation.ArgbEvaluator;
 
 import org.thoughtcrime.securesms.IntroPagerAdapter.IntroPage;
+import org.thoughtcrime.securesms.experienceupgrades.StickersIntroFragment;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.notifications.NotificationIds;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -29,10 +34,15 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.Collections;
 import java.util.List;
 
-public class ExperienceUpgradeActivity extends BaseActionBarActivity implements TypingIndicatorIntroFragment.Controller, LinkPreviewsIntroFragment.Controller {
+public class ExperienceUpgradeActivity extends BaseActionBarActivity
+                                       implements TypingIndicatorIntroFragment.Controller,
+                                                  LinkPreviewsIntroFragment.Controller,
+                                                  StickersIntroFragment.Controller
+{
   private static final String TAG             = ExperienceUpgradeActivity.class.getSimpleName();
   private static final String DISMISS_ACTION  = "org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";
-  private static final int    NOTIFICATION_ID = 1339;
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
 
   private enum ExperienceUpgrade {
     SIGNAL_REBRANDING(157,
@@ -63,7 +73,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
              R.string.ExperienceUpgradeActivity_signal_profiles_are_here,
              R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
              R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
-             CreateProfileActivity.class,
+             EditProfileActivity.class,
              false),
     READ_RECEIPTS(299,
                   new IntroPage(0xFF2090EA,
@@ -86,8 +96,15 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
                   R.string.ExperienceUpgradeActivity_introducing_link_previews,
                   R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
                   R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
-        null,
-        true);
+                  null,
+                  true),
+    STICKERS(580,
+             new IntroPage(0xFF2090EA, StickersIntroFragment.newInstance()),
+             R.string.ExperienceUpgradeActivity_introducing_stickers,
+             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
+             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
+             null,
+             true);
 
     private            int             version;
     private            List<IntroPage> pages;
@@ -157,7 +174,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setStatusBarColor(getResources().getColor(R.color.signal_primary_dark));
+    dynamicTheme.onCreate(this);
 
     final Optional<ExperienceUpgrade> upgrade = getExperienceUpgrade(this);
     if (!upgrade.isPresent()) {
@@ -179,11 +196,17 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
     }
 
     getWindow().setBackgroundDrawable(new ColorDrawable(upgrade.get().getPage(0).backgroundColor));
-    ServiceUtil.getNotificationManager(this).cancel(NOTIFICATION_ID);
+    ServiceUtil.getNotificationManager(this).cancel(NotificationIds.EXPERIENCE_UPGRADE);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
   }
 
   private void onContinue(Optional<ExperienceUpgrade> seenUpgrade) {
-    ServiceUtil.getNotificationManager(this).cancel(NOTIFICATION_ID);
+    ServiceUtil.getNotificationManager(this).cancel(NotificationIds.EXPERIENCE_UPGRADE);
     int latestVersion = seenUpgrade.isPresent() ? seenUpgrade.get().getVersion()
                                                 : Util.getCanonicalVersionCode();
     TextSecurePreferences.setLastExperienceVersionCode(this, latestVersion);
@@ -232,29 +255,9 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
     onContinue(Optional.of(ExperienceUpgrade.LINK_PREVIEWS));
   }
 
-  private final class OnPageChangeListener implements ViewPager.OnPageChangeListener {
-    private final ArgbEvaluator     evaluator = new ArgbEvaluator();
-    private final ExperienceUpgrade upgrade;
-
-    public OnPageChangeListener(ExperienceUpgrade upgrade) {
-      this.upgrade = upgrade;
-    }
-
-    @Override
-    public void onPageSelected(int position) {}
-
-    @Override
-    public void onPageScrollStateChanged(int state) {}
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-      final int nextPosition = (position + 1) % upgrade.getPages().size();
-
-      final int color = (Integer)evaluator.evaluate(positionOffset,
-                                                    upgrade.getPage(position).backgroundColor,
-                                                    upgrade.getPage(nextPosition).backgroundColor);
-      getWindow().setBackgroundDrawable(new ColorDrawable(color));
-    }
+  @Override
+  public void onStickersFinished() {
+    onContinue(Optional.of(ExperienceUpgrade.STICKERS));
   }
 
   public static class AppUpgradeReceiver extends BroadcastReceiver {
@@ -278,7 +281,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
                                                           PendingIntent.FLAG_UPDATE_CURRENT))
               .build();
 
-          ServiceUtil.getNotificationManager(context).notify(NOTIFICATION_ID, notification);
+          ServiceUtil.getNotificationManager(context).notify(NotificationIds.EXPERIENCE_UPGRADE, notification);
         }
 
         Optional<ExperienceUpgrade> experienceUpgrade = getExperienceUpgrade(context);
@@ -310,7 +313,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
                                                                                     dismissIntent,
                                                                                     PendingIntent.FLAG_UPDATE_CURRENT))
                                         .build();
-        ServiceUtil.getNotificationManager(context).notify(NOTIFICATION_ID, notification);
+        ServiceUtil.getNotificationManager(context).notify(NotificationIds.EXPERIENCE_UPGRADE, notification);
       } else if (DISMISS_ACTION.equals(intent.getAction())) {
         TextSecurePreferences.setExperienceDismissedVersionCode(context, Util.getCanonicalVersionCode());
       }

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

@@ -5,13 +5,11 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import androidx.appcompat.app.AlertDialog;
-import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientExporter;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -115,12 +113,12 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
     }
 
     private String getRecipientName(Recipient recipient) {
-      if (FeatureFlags.PROFILE_DISPLAY) return recipient.getDisplayName(context);
+      if (FeatureFlags.profileDisplay()) return recipient.getDisplayName(context);
 
       String name = recipient.toShortString(context);
 
-      if (recipient.getName(context) == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-        name += " ~" + recipient.getProfileName();
+      if (recipient.getName(context) == null && !recipient.getProfileName().isEmpty()) {
+        name += " ~" + recipient.getProfileName().toString();
       }
 
       return name;

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

@@ -5,22 +5,18 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.PushDatabase;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
-import org.thoughtcrime.securesms.jobs.PushDecryptJob;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.Locale;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -63,21 +59,19 @@ public class IncomingMessageProcessor {
   public class Processor implements Closeable {
 
     private final Context           context;
-    private final RecipientDatabase recipientDatabase;
     private final PushDatabase      pushDatabase;
     private final MmsSmsDatabase    mmsSmsDatabase;
     private final JobManager        jobManager;
 
     private Processor(@NonNull Context context) {
       this.context           = context;
-      this.recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
       this.pushDatabase      = DatabaseFactory.getPushDatabase(context);
       this.mmsSmsDatabase    = DatabaseFactory.getMmsSmsDatabase(context);
       this.jobManager        = ApplicationDependencies.getJobManager();
     }
 
     /**
-     * @return The id of the {@link PushDecryptJob} that was scheduled to process the message, if
+     * @return The id of the {@link PushDecryptMessageJob} that was scheduled to process the message, if
      *         one was created. Otherwise null.
      */
     public @Nullable String processEnvelope(@NonNull SignalServiceEnvelope envelope) {
@@ -99,8 +93,8 @@ public class IncomingMessageProcessor {
     private @NonNull String processMessage(@NonNull SignalServiceEnvelope envelope) {
       Log.i(TAG, "Received message. Inserting in PushDatabase.");
 
-      long           id  = pushDatabase.insert(envelope);
-      PushDecryptJob job = new PushDecryptJob(context, id);
+      long                  id  = pushDatabase.insert(envelope);
+      PushDecryptMessageJob job = new PushDecryptMessageJob(context, id);
 
       jobManager.add(job);
 

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

@@ -14,12 +14,18 @@ import androidx.fragment.app.Fragment;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
+import org.thoughtcrime.securesms.lock.v2.PinUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.profiles.ProfileName;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.util.CensorshipUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
@@ -35,6 +41,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   private static final int STATE_UI_BLOCKING_UPGRADE = 3;
   private static final int STATE_EXPERIENCE_UPGRADE  = 4;
   private static final int STATE_WELCOME_PUSH_SCREEN = 5;
+  private static final int STATE_CREATE_PROFILE_NAME = 6;
+  private static final int STATE_CREATE_KBS_PIN      = 7;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
@@ -150,6 +158,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       case STATE_UI_BLOCKING_UPGRADE: return getUiBlockingUpgradeIntent();
       case STATE_WELCOME_PUSH_SCREEN: return getPushRegistrationIntent();
       case STATE_EXPERIENCE_UPGRADE:  return getExperienceUpgradeIntent();
+      case STATE_CREATE_KBS_PIN:      return getCreateKbsPinIntent();
+      case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
       default:                        return null;
     }
   }
@@ -165,11 +175,23 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       return STATE_WELCOME_PUSH_SCREEN;
     } else if (ExperienceUpgradeActivity.isUpdate(this)) {
       return STATE_EXPERIENCE_UPGRADE;
+    } else if (userMustSetProfileName()) {
+      return STATE_CREATE_PROFILE_NAME;
+    } else if (userMustSetKbsPin()) {
+      return STATE_CREATE_KBS_PIN;
     } else {
       return STATE_NORMAL;
     }
   }
 
+  private boolean userMustSetKbsPin() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && !PinUtil.userHasPin(this);
+  }
+
+  private boolean userMustSetProfileName() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && TextSecurePreferences.getProfileName(this) == ProfileName.EMPTY;
+  }
+
   private Intent getCreatePassphraseIntent() {
     return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
   }
@@ -193,6 +215,22 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     return RegistrationNavigationActivity.newIntentForNewRegistration(this);
   }
 
+  private Intent getCreateKbsPinIntent() {
+
+    final Intent intent;
+    if (userMustSetProfileName()) {
+      intent = getCreateProfileNameIntent();
+    } else {
+      intent = getIntent();
+    }
+
+    return getRoutedIntent(CreateKbsPinActivity.class, intent);
+  }
+
+  private Intent getCreateProfileNameIntent() {
+    return getRoutedIntent(EditProfileActivity.class, getIntent());
+  }
+
   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/RecipientPreferenceActivity.java

@@ -209,6 +209,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
       getWindow().setStatusBarColor(Color.TRANSPARENT);
+
+      ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.recipient_preference_root), (v, insets) -> {
+        ViewUtil.setTopMargin(toolbar, insets.getSystemWindowInsetTop());
+        return insets;
+      });
     }
   }
 
@@ -429,7 +434,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
         colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
 
-        if (FeatureFlags.PROFILE_DISPLAY) {
+        if (FeatureFlags.profileDisplay()) {
           aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
           aboutPreference.setSummary(recipient.resolve().getE164().or(""));
         } else {

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

@@ -275,7 +275,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
       byte[] localId;
       byte[] remoteId;
 
-      if (FeatureFlags.UUIDS && recipient.resolve().getUuid().isPresent()) {
+      if (FeatureFlags.uuids() && recipient.resolve().getUuid().isPresent()) {
         Log.i(TAG, "Using UUID (version 2).");
         version  = 2;
         localId  = UuidUtil.toByteArray(TextSecurePreferences.getLocalUuid(requireContext()));

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

@@ -24,11 +24,9 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.media.AudioManager;
-import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.app.ActivityCompat;
 
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
@@ -152,6 +150,20 @@ public class WebRtcCallActivity extends Activity {
     callScreen.setBluetoothButtonListener(new BluetoothButtonListener());
   }
 
+  private void handleSetAudioSpeaker(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, enabled);
+    startService(intent);
+  }
+
+  private void handleSetAudioBluetooth(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
+    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, enabled);
+    startService(intent);
+  }
+
   private void handleSetMuteAudio(boolean enabled) {
     Intent intent = new Intent(this, WebRtcCallService.class);
     intent.setAction(WebRtcCallService.ACTION_SET_MUTE_AUDIO);
@@ -376,28 +388,14 @@ public class WebRtcCallActivity extends Activity {
   private class SpeakerButtonListener implements WebRtcCallControls.SpeakerButtonListener {
     @Override
     public void onSpeakerChange(boolean isSpeaker) {
-      AudioManager audioManager = ServiceUtil.getAudioManager(WebRtcCallActivity.this);
-      audioManager.setSpeakerphoneOn(isSpeaker);
-
-      if (isSpeaker && audioManager.isBluetoothScoOn()) {
-        audioManager.stopBluetoothSco();
-        audioManager.setBluetoothScoOn(false);
-      }
+      WebRtcCallActivity.this.handleSetAudioSpeaker(isSpeaker);
     }
   }
 
   private class BluetoothButtonListener implements WebRtcCallControls.BluetoothButtonListener {
     @Override
     public void onBluetoothChange(boolean isBluetooth) {
-      AudioManager audioManager = ServiceUtil.getAudioManager(WebRtcCallActivity.this);
-
-      if (isBluetooth) {
-        audioManager.startBluetoothSco();
-        audioManager.setBluetoothScoOn(true);
-      } else {
-        audioManager.stopBluetoothSco();
-        audioManager.setBluetoothScoOn(false);
-      }
+      WebRtcCallActivity.this.handleSetAudioBluetooth(isBluetooth);
     }
   }
 

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

@@ -0,0 +1,32 @@
+package org.thoughtcrime.securesms.animation;
+
+import android.animation.Animator;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Consumer;
+
+public final class AnimationRepeatListener implements Animator.AnimatorListener {
+
+  private final Consumer<Animator> animationConsumer;
+
+  public AnimationRepeatListener(@NonNull Consumer<Animator> animationConsumer) {
+    this.animationConsumer = animationConsumer;
+  }
+
+  @Override
+  public final void onAnimationStart(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationEnd(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationCancel(Animator animation) {
+  }
+
+  @Override
+  public final void onAnimationRepeat(Animator animation) {
+    this.animationConsumer.accept(animation);
+  }
+}

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

@@ -1,12 +1,15 @@
 package org.thoughtcrime.securesms.attachments;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.thoughtcrime.securesms.util.Util;
 
-public class AttachmentId {
+public class AttachmentId implements Parcelable {
 
   @JsonProperty
   private final long rowId;
@@ -19,6 +22,11 @@ public class AttachmentId {
     this.uniqueId = uniqueId;
   }
 
+  private AttachmentId(Parcel in) {
+    this.rowId    = in.readLong();
+    this.uniqueId = in.readLong();
+  }
+
   public long getRowId() {
     return rowId;
   }
@@ -54,4 +62,28 @@ public class AttachmentId {
   public int hashCode() {
     return Util.hashCode(rowId, uniqueId);
   }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(rowId);
+    dest.writeLong(uniqueId);
+  }
+
+  public static final Creator<AttachmentId> CREATOR = new Creator<AttachmentId>() {
+    @Override
+    public AttachmentId createFromParcel(Parcel in) {
+      return new AttachmentId(in);
+    }
+
+    @Override
+    public AttachmentId[] newArray(int size) {
+      return new AttachmentId[size];
+    }
+  };
+
 }

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

@@ -11,12 +11,15 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformPropertie
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
+import java.util.Comparator;
+
 public class DatabaseAttachment extends Attachment {
 
   private final AttachmentId attachmentId;
   private final long         mmsId;
   private final boolean      hasData;
   private final boolean      hasThumbnail;
+  private final int          displayOrder;
 
   public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
                             boolean hasData, boolean hasThumbnail,
@@ -25,13 +28,14 @@ public class DatabaseAttachment extends Attachment {
                             byte[] digest, String fastPreflightId, boolean voiceNote,
                             int width, int height, boolean quote, @Nullable String caption,
                             @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash,
-                            @Nullable TransformProperties transformProperties)
+                            @Nullable TransformProperties transformProperties, int displayOrder)
   {
     super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;
     this.mmsId        = mmsId;
+    this.displayOrder = displayOrder;
   }
 
   @Override
@@ -58,6 +62,10 @@ public class DatabaseAttachment extends Attachment {
     return attachmentId;
   }
 
+  public int getDisplayOrder() {
+    return displayOrder;
+  }
+
   @Override
   public boolean equals(Object other) {
     return other != null &&
@@ -81,4 +89,11 @@ public class DatabaseAttachment extends Attachment {
   public boolean hasThumbnail() {
     return hasThumbnail;
   }
+
+  public static class DisplayOrderComparator implements Comparator<DatabaseAttachment> {
+    @Override
+    public int compare(DatabaseAttachment lhs, DatabaseAttachment rhs) {
+      return Integer.compare(lhs.getDisplayOrder(), rhs.getDisplayOrder());
+    }
+  }
 }

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

@@ -7,7 +7,6 @@ import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
-import android.util.Pair;
 
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -15,6 +14,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.whispersystems.libsignal.util.Pair;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;