Bump version to 5.15.5

* Mute icon in wrong location in RTL
* No exit animation when dismissing conversation settings
* Thumbnails flicker when you come back to conversation settings
* Rounded corners for mute dialog don't match other dialogs
* Mute button in note-to-self conversation settings
* Explore adding contact details to the contact bottom sheet

.github/workflows/android.yml

@@ -24,6 +24,9 @@ jobs:
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
 
+    - name: Remove Android S
+      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-S"
+
     - name: Build with Gradle
       run: ./gradlew qa
 

.idea/codeStyles/Project.xml

@@ -0,0 +1,193 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="240" />
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <option name="SOFT_MARGINS" value="160" />
+    <JavaCodeStyleSettings>
+      <option name="GENERATE_FINAL_LOCALS" value="true" />
+      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="BRACE_STYLE" value="5" />
+      <option name="CLASS_BRACE_STYLE" value="5" />
+      <option name="METHOD_BRACE_STYLE" value="5" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="ALIGN_GROUP_FIELD_DECLARATIONS" value="true" />
+      <option name="ALIGN_CONSECUTIVE_VARIABLE_DECLARATIONS" value="true" />
+      <option name="ALIGN_CONSECUTIVE_ASSIGNMENTS" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+      <option name="METHOD_ANNOTATION_WRAP" value="0" />
+      <option name="CLASS_ANNOTATION_WRAP" value="0" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
+      <option name="WRAP_ON_TYPING" value="0" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+      <arrangement>
+        <groups>
+          <group>
+            <type>GETTERS_AND_SETTERS</type>
+            <order>KEEP</order>
+          </group>
+          <group>
+            <type>OVERRIDDEN_METHODS</type>
+            <order>KEEP</order>
+          </group>
+          <group>
+            <type>DEPENDENT_METHODS</type>
+            <order>BREADTH_FIRST</order>
+          </group>
+        </groups>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

app/build.gradle

@@ -11,6 +11,8 @@ apply plugin: 'witness'
 apply plugin: 'org.jlleitschuh.gradle.ktlint'
 apply from: 'translations.gradle'
 apply from: 'witness-verifications.gradle'
+apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'app.cash.exhaustive'
 
 repositories {
     maven {
@@ -25,12 +27,6 @@ repositories {
             includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
         }
     }
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
-        content {
-            includeGroupByRegex "org\\.signal.*"
-        }
-    }
     maven { // textdrawable
         url 'https://dl.bintray.com/amulyakhare/maven'
         content {
@@ -61,8 +57,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 823
-def canonicalVersionName = "5.8.7"
+def canonicalVersionCode = 872
+def canonicalVersionName = "5.15.5"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -80,6 +76,11 @@ android {
     flavorDimensions 'distribution', 'environment'
     useLibrary 'org.apache.http.legacy'
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+    }
+
     dexOptions {
         javaMaxHeapSize "4g"
     }
@@ -117,6 +118,8 @@ android {
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
         buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\"}"
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\"}"
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
@@ -131,6 +134,12 @@ android {
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
         buildConfigField "int[]", "MOBILE_COIN_REGIONS", "new int[]{44}"
+        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
+        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
+
+        buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
+        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
+        buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
 
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -196,28 +205,34 @@ android {
                     'proguard/proguard.cfg'
             testProguardFiles 'proguard/proguard-automation.pro',
                     'proguard/proguard.cfg'
+
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
         }
         flipper {
             initWith debug
             isDefault false
             minifyEnabled false
             matchingFallbacks = ['debug']
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Flipper\""
         }
         release {
             minifyEnabled true
             proguardFiles = buildTypes.debug.proguardFiles
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Release\""
         }
         perf {
             initWith debug
             isDefault false
             debuggable false
             matchingFallbacks = ['debug']
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Perf\""
         }
         mock {
             initWith debug
             isDefault false
             minifyEnabled false
             matchingFallbacks = ['debug']
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Mock\""
         }
     }
 
@@ -228,6 +243,7 @@ android {
             ext.websiteUpdateUrl = "null"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
         }
 
         website {
@@ -235,6 +251,7 @@ android {
             ext.websiteUpdateUrl = "https://updates.signal.org/android"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
         }
 
         internal {
@@ -242,6 +259,7 @@ android {
             ext.websiteUpdateUrl = "null"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"internal\""
         }
 
         study {
@@ -251,6 +269,7 @@ android {
             ext.websiteUpdateUrl = "null"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"study\""
         }
 
         prod {
@@ -259,6 +278,7 @@ android {
             isDefault true
 
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
+            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\""
         }
 
         staging {
@@ -280,6 +300,9 @@ android {
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
+            buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
+
+            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
         }
     }
 
@@ -321,6 +344,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
     lintChecks project(':lintchecks')
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
@@ -329,7 +353,7 @@ dependencies {
         force = true
     }
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.0.0'
@@ -351,7 +375,7 @@ dependencies {
     implementation "androidx.autofill:autofill:1.0.0"
     implementation "androidx.biometric:biometric:1.1.0"
 
-    implementation ('com.google.firebase:firebase-messaging:20.2.0') {
+    implementation ('com.google.firebase:firebase-messaging:22.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -374,16 +398,16 @@ dependencies {
     implementation project(':device-transfer')
 
     implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.1.7'
+    implementation 'org.whispersystems:signal-client-android:0.8.0'
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
 
-    implementation('com.mobilecoin:android-sdk:1.0.0') {
+    implementation('com.mobilecoin:android-sdk:1.1.0') {
         exclude group: 'com.google.protobuf'
     }
 
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.9.4'
+    implementation 'org.signal:ringrtc-android:2.10.1.1'
 
     implementation "me.leolin:ShortcutBadger:1.1.22"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -425,15 +449,18 @@ dependencies {
 
     implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
     implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
-    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
+
+    implementation "net.zetetic:android-database-sqlcipher:4.4.3"
+    implementation "androidx.sqlite:sqlite:2.1.0"
+
     implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
     implementation 'dnsjava:dnsjava:2.1.9'
 
-    flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
-    flipperImplementation 'com.facebook.soloader:soloader:0.8.2'
+    flipperImplementation 'com.facebook.flipper:flipper:0.91.0'
+    flipperImplementation 'com.facebook.soloader:soloader:0.10.1'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.assertj:assertj-core:3.11.1'
@@ -454,6 +481,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0"
 }
 
 dependencyVerification {
@@ -522,6 +550,10 @@ task signProductionWebsiteRelease {
 }
 
 def getLastCommitTimestamp() {
+    if (!(new File('.git').exists())) {
+        return System.currentTimeMillis().toString()
+    }
+
     new ByteArrayOutputStream().withStream { os ->
         def result = exec {
             executable = 'git'
@@ -534,6 +566,10 @@ def getLastCommitTimestamp() {
 }
 
 def getGitHash() {
+    if (!(new File('.git').exists())) {
+        return "abcd1234"
+    }
+
     def stdout = new ByteArrayOutputStream()
     exec {
         commandLine 'git', 'rev-parse', '--short', 'HEAD'

app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java

@@ -17,6 +17,7 @@ import net.sqlcipher.database.SQLiteStatement;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.util.Hex;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -237,7 +238,12 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
       case Cursor.FIELD_TYPE_FLOAT:
         return cursor.getDouble(column);
       case Cursor.FIELD_TYPE_BLOB:
-        return cursor.getBlob(column);
+        byte[] blob = cursor.getBlob(column);
+        String bytes = blob != null ? "(blob) " + Hex.toStringCondensed(Arrays.copyOf(blob, Math.min(blob.length, 32))) : null;
+        if (bytes != null && bytes.length() == 32 && blob.length > 32) {
+          bytes += "...";
+        }
+        return bytes;
       case Cursor.FIELD_TYPE_STRING:
       default:
         return cursor.getString(column);

app/src/main/AndroidManifest.xml

@@ -153,6 +153,14 @@
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="tsdevice"/>
         </intent-filter>
+
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sgnl"
+                  android:host="linkdevice"/>
+        </intent-filter>
     </activity>
 
     <activity android:name=".preferences.MmsPreferencesActivity"
@@ -300,13 +308,10 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
-    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
-              android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
-              android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name=".recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:theme="@style/Signal.DayNight.NoActionBar"
+              android:windowSoftInputMode="adjustResize"/>
 
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
@@ -358,8 +363,9 @@
     <activity android:name=".VerifyIdentityActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ApplicationPreferencesActivity"
+    <activity android:name=".components.settings.app.AppSettingsActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:theme="@style/Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
@@ -367,6 +373,13 @@
         </intent-filter>
     </activity>
 
+        <activity android:name=".components.settings.conversation.ConversationSettingsActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:theme="@style/Signal.DayNight.ConversationSettings"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
+
         <activity android:name=".wallpaper.ChatWallpaperActivity"
                   android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
                   android:windowSoftInputMode="stateAlwaysHidden">
@@ -486,7 +499,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
-              android:theme="@style/TextSecure.DarkTheme"
+              android:theme="@style/Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".profiles.edit.EditProfileActivity"
@@ -576,6 +589,10 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:launchMode="singleTask" />
 
+    <activity android:name=".ratelimit.RecaptchaProofActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" />
+
     <activity android:name=".wallpaper.crop.WallpaperImageSelectionActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:theme="@style/TextSecure.FullScreenMedia" />
@@ -585,6 +602,10 @@
               android:screenOrientation="portrait"
               android:theme="@style/Theme.Signal.WallpaperCropper" />
 
+    <activity android:name=".reactions.edit.EditReactionsActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <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"/>
@@ -696,24 +717,12 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
-              android:exported="false">
-        <intent-filter>
-          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
-        </intent-filter>
-    </receiver>
-
     <receiver android:name=".service.ExpirationListener" />
 
     <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
 
+    <receiver android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm" />
+
     <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
 
     <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />

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

@@ -17,6 +17,6 @@ public final class AppCapabilities {
    *                       asking if the user has set a Signal PIN or not.
    */
   public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION);
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, FeatureFlags.senderKey());
   }
 }

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

@@ -8,6 +8,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.insights.InsightsOptOut;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
@@ -60,6 +61,7 @@ public final class AppInitialization {
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+    EmojiSearchIndexDownloadJob.scheduleImmediately();
   }
 
   /**

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

@@ -40,8 +40,11 @@ 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;
+import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
+import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
+import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
@@ -56,11 +59,10 @@ import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
-import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
@@ -69,6 +71,7 @@ import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.util.ByteUnit;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
@@ -144,6 +147,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addBlocking("feature-flags", FeatureFlags::init)
                             .addNonBlocking(this::initializeRevealableMessageManager)
+                            .addNonBlocking(this::initializePendingRetryReceiptManager)
                             .addNonBlocking(this::initializeGcmCheck)
                             .addNonBlocking(this::initializeSignedPreKeyCheck)
                             .addNonBlocking(this::initializePeriodicTasks)
@@ -154,7 +158,13 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(RefreshPreKeysJob::scheduleIfNecessary)
                             .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
                             .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
+                            .addNonBlocking(EmojiSource::refresh)
+                            .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                             .addPostRender(this::initializeExpiringMessageManager)
+                            .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
+                            .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
+                            .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
+                            .addPostRender(() -> DatabaseFactory.getMessageLogDatabase(this).trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -228,7 +238,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
   }
 
   private void initializeLogging() {
-    persistentLogger = new PersistentLogger(this, LogSecretProvider.getOrCreateAttachmentSecret(this), BuildConfig.VERSION_NAME);
+    persistentLogger = new PersistentLogger(this, LogSecretProvider.getOrCreateAttachmentSecret(this), BuildConfig.VERSION_NAME, FeatureFlags.internalUser() ? 15 : 7, ByteUnit.KILOBYTES.toBytes(300));
     org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);
 
     SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
@@ -293,6 +303,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
   }
 
+  private void initializePendingRetryReceiptManager() {
+    ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
+  }
+
   private void initializePeriodicTasks() {
     RotateSignedPreKeyListener.schedule(this);
     DirectoryRefreshListener.schedule(this);

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

@@ -1,404 +0,0 @@
-/*
- * Copyright (C) 2011 Whisper Systems
- * Copyright (C) 2013-2017 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.app.AlertDialog;
-import android.content.Intent;
-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;
-import androidx.core.content.ContextCompat;
-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;
-import org.thoughtcrime.securesms.preferences.BackupsPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
-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.manage.ManageProfileActivity;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.CachedInflater;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-/**
- * The Activity for application preference display and management.
- *
- * @author Moxie Marlinspike
- *
- */
-
-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_NOTIFICATIONS_FRAGMENT = "launch.to.notifications.fragment";
-
-  @SuppressWarnings("unused")
-  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";
-  private static final String PREFERENCE_CATEGORY_SMS_MMS        = "preference_category_sms_mms";
-  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS  = "preference_category_notifications";
-  private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
-  private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
-  private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
-  private static final String PREFERENCE_CATEGORY_STORAGE        = "preference_category_storage";
-  private static final String PREFERENCE_CATEGORY_DEVICES        = "preference_category_devices";
-  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";
-
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private boolean wasConfigurationUpdated = false;
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle icicle, boolean ready) {
-    //noinspection ConstantConditions
-    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    if (getIntent() != null && getIntent().getCategories() != null && getIntent().getCategories().contains("android.intent.category.NOTIFICATION_PREFERENCES")) {
-      initFragment(android.R.id.content, new NotificationsPreferenceFragment());
-    } 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)) {
-      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 {
-      wasConfigurationUpdated = icicle.getBoolean(WAS_CONFIGURATION_UPDATED);
-    }
-  }
-
-  @Override
-  protected void onSaveInstanceState(@NonNull Bundle outState) {
-    outState.putBoolean(WAS_CONFIGURATION_UPDATED, wasConfigurationUpdated);
-    super.onSaveInstanceState(outState);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-  }
-
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-    Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.content);
-    fragment.onActivityResult(requestCode, resultCode, data);
-  }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    FragmentManager fragmentManager = getSupportFragmentManager();
-    if (fragmentManager.getBackStackEntryCount() > 0) {
-      fragmentManager.popBackStack();
-    } else {
-      if (wasConfigurationUpdated) {
-        setResult(MainActivity.RESULT_CONFIG_CHANGED);
-      } else {
-        setResult(RESULT_OK);
-      }
-      finish();
-    }
-    return true;
-  }
-
-  @Override
-  public void onBackPressed() {
-    onSupportNavigateUp();
-  }
-
-  @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-    if (key.equals(TextSecurePreferences.THEME_PREF)) {
-      DynamicTheme.setDefaultDayNightMode(this);
-      recreate();
-    } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
-      CachedInflater.from(this).clear();
-      wasConfigurationUpdated = true;
-      recreate();
-
-      Intent intent = new Intent(this, KeyCachingService.class);
-      intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT);
-      startService(intent);
-    }
-  }
-
-  public void pushFragment(@NonNull Fragment fragment) {
-    getSupportFragmentManager().beginTransaction()
-                               .setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end)
-                               .replace(android.R.id.content, fragment)
-                               .addToBackStack(null)
-                               .commit();
-  }
-
-  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
-
-    private final UnreadPaymentsLiveData unreadPaymentsLiveData = new UnreadPaymentsLiveData();
-
-    @Override
-    public void onCreate(Bundle icicle) {
-      super.onCreate(icicle);
-
-      this.findPreference(PREFERENCE_CATEGORY_PROFILE)
-          .setOnPreferenceClickListener(new ProfileClickListener());
-      this.findPreference(PREFERENCE_CATEGORY_USERNAME)
-          .setOnPreferenceClickListener(new UsernameClickListener());
-      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS));
-      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
-      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION));
-      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
-      this.findPreference(PREFERENCE_CATEGORY_CHATS)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
-      this.findPreference(PREFERENCE_CATEGORY_STORAGE)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_STORAGE));
-      this.findPreference(PREFERENCE_CATEGORY_DEVICES)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES));
-      this.findPreference(PREFERENCE_CATEGORY_HELP)
-          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
-      this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
-          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
-      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;
-
-      Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS);
-      preference.getIcon().setColorFilter(ContextCompat.getColor(requireContext(), R.color.signal_icon_tint_primary), PorterDuff.Mode.SRC_IN);
-    }
-
-    @Override
-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
-      addPreferencesFromResource(R.xml.preferences);
-
-      if (FeatureFlags.usernames()) {
-        UsernamePreference pref = (UsernamePreference) findPreference(PREFERENCE_CATEGORY_USERNAME);
-        pref.setVisible(shouldDisplayUsernameReminder());
-        pref.setOnLongClickListener(v -> {
-          new AlertDialog.Builder(requireContext())
-                         .setMessage(R.string.ApplicationPreferencesActivity_hide_reminder)
-                         .setPositiveButton(R.string.ApplicationPreferencesActivity_hide, (dialog, which) -> {
-                           dialog.dismiss();
-                           SignalStore.misc().hideUsernameReminder();
-                             findPreference(PREFERENCE_CATEGORY_USERNAME).setVisible(false);
-                         })
-                         .setNegativeButton(android.R.string.cancel, ((dialog, which) -> dialog.dismiss()))
-                         .setCancelable(true)
-                         .show();
-          return true;
-        });
-      }
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-      //noinspection ConstantConditions
-      ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.text_secure_normal__menu_settings);
-      setCategorySummaries();
-      setCategoryVisibility();
-    }
-
-    private void setCategorySummaries() {
-      ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();
-
-      if (FeatureFlags.usernames()) {
-        this.findPreference(PREFERENCE_CATEGORY_USERNAME)
-            .setVisible(shouldDisplayUsernameReminder());
-      }
-
-      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
-          .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
-          .setSummary(NotificationsPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
-          .setSummary(AppProtectionPreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
-          .setSummary(AppearancePreferenceFragment.getSummary(getActivity()));
-      this.findPreference(PREFERENCE_CATEGORY_CHATS)
-          .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
-    }
-
-    private void setCategoryVisibility() {
-      Preference devicePreference = this.findPreference(PREFERENCE_CATEGORY_DEVICES);
-      if (devicePreference != null && !TextSecurePreferences.isPushRegistered(getActivity())) {
-        getPreferenceScreen().removePreference(devicePreference);
-      }
-    }
-
-    private static boolean shouldDisplayUsernameReminder() {
-      return FeatureFlags.usernames() && !Recipient.self().getUsername().isPresent() && SignalStore.misc().shouldShowUsernameReminder();
-    }
-
-    private class CategoryClickListener implements Preference.OnPreferenceClickListener {
-      private String category;
-
-      CategoryClickListener(String category) {
-        this.category = category;
-      }
-
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        Fragment fragment = null;
-
-        switch (category) {
-        case PREFERENCE_CATEGORY_SMS_MMS:
-          fragment = new SmsMmsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_NOTIFICATIONS:
-          fragment = new NotificationsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_APP_PROTECTION:
-          fragment = new AppProtectionPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_APPEARANCE:
-          fragment = new AppearancePreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_CHATS:
-          fragment = new ChatsPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_STORAGE:
-          fragment = new DataAndStoragePreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_DEVICES:
-          Intent intent = new Intent(getActivity(), DeviceActivity.class);
-          startActivity(intent);
-          break;
-        case PREFERENCE_CATEGORY_ADVANCED:
-          fragment = new AdvancedPreferenceFragment();
-          break;
-        case PREFERENCE_CATEGORY_HELP:
-          fragment = new HelpFragment();
-          break;
-        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();
-        }
-
-        if (fragment != null) {
-          Bundle args = new Bundle();
-          fragment.setArguments(args);
-
-          ((ApplicationPreferencesActivity) requireActivity()).pushFragment(fragment);
-        }
-
-        return true;
-      }
-    }
-
-    private class ProfileClickListener implements Preference.OnPreferenceClickListener {
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        requireActivity().startActivity(ManageProfileActivity.getIntent(requireActivity()));
-        return true;
-      }
-    }
-
-    private class UsernameClickListener implements Preference.OnPreferenceClickListener {
-      @Override
-      public boolean onPreferenceClick(Preference preference) {
-        requireActivity().startActivity(ManageProfileActivity.getIntentForUsernameEdit(preference.getContext()));
-        return true;
-      }
-    }
-  }
-
-}

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

@@ -11,8 +11,12 @@ import androidx.lifecycle.Observer;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
+import org.thoughtcrime.securesms.conversation.colors.Colorizable;
+import org.thoughtcrime.securesms.conversation.colors.Colorizer;
+import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
+import org.thoughtcrime.securesms.giph.mp4.GiphyMp4Playable;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -20,13 +24,14 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.video.exo.AttachmentMediaSourceFactory;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-public interface BindableConversationItem extends Unbindable {
+public interface BindableConversationItem extends Unbindable, GiphyMp4Playable, Colorizable {
   void bind(@NonNull LifecycleOwner lifecycleOwner,
             @NonNull ConversationMessage messageRecord,
             @NonNull Optional<MessageRecord> previousMessageRecord,
@@ -38,12 +43,19 @@ public interface BindableConversationItem extends Unbindable {
             @Nullable String searchQuery,
             boolean pulseMention,
             boolean hasWallpaper,
-            boolean isMessageRequestAccepted);
+            boolean isMessageRequestAccepted,
+            @NonNull AttachmentMediaSourceFactory attachmentMediaSourceFactory,
+            boolean canPlayInline,
+            @NonNull Colorizer colorizer);
 
   ConversationMessage getConversationMessage();
 
   void setEventListener(@Nullable EventListener listener);
 
+  default void updateTimestamps() {
+    // Intentionally Blank.
+  }
+
   interface EventListener {
     void onQuoteClicked(MmsMessageRecord messageRecord);
     void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
@@ -57,17 +69,22 @@ public interface BindableConversationItem extends Unbindable {
     void onReactionClicked(@NonNull View reactionTarget, long messageId, boolean isMms);
     void onGroupMemberClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
     void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
+    void onMessageWithRecaptchaNeededClicked(@NonNull MessageRecord messageRecord);
     void onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
     void onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
     void onVoiceNotePause(@NonNull Uri uri);
     void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
     void onVoiceNoteSeekTo(@NonNull Uri uri, double position);
     void onGroupMigrationLearnMoreClicked(@NonNull GroupMigrationMembershipChange membershipChange);
-    void onDecryptionFailedLearnMoreClicked();
+    void onChatSessionRefreshLearnMoreClicked();
+    void onBadDecryptLearnMoreClicked(@NonNull RecipientId author);
     void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient);
     void onJoinGroupCallClicked();
     void onInviteFriendsToGroupClicked(@NonNull GroupId.V2 groupId);
     void onEnableCallNotificationsClicked();
+    void onPlayInlineContent(ConversationMessage conversationMessage);
+    void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord);
+    void onViewGroupDescriptionChange(@Nullable GroupId groupId, @NonNull String description, boolean isMessageRequestAccepted);
 
     /** @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/BlockUnblockDialog.java

@@ -9,6 +9,8 @@ import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.Lifecycle;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
@@ -30,15 +32,15 @@ public final class BlockUnblockDialog {
                    AlertDialog.Builder::show);
   }
 
-  public static void showBlockAndDeleteFor(@NonNull Context context,
-                                           @NonNull Lifecycle lifecycle,
-                                           @NonNull Recipient recipient,
-                                           @NonNull Runnable onBlock,
-                                           @NonNull Runnable onBlockAndDelete)
+  public static void showBlockAndReportSpamFor(@NonNull Context context,
+                                               @NonNull Lifecycle lifecycle,
+                                               @NonNull Recipient recipient,
+                                               @NonNull Runnable onBlock,
+                                               @NonNull Runnable onBlockAndReportSpam)
   {
     SimpleTask.run(lifecycle,
-        () -> buildBlockFor(context, recipient, onBlock, onBlockAndDelete),
-        AlertDialog.Builder::show);
+                   () -> buildBlockFor(context, recipient, onBlock, onBlockAndReportSpam),
+                   AlertDialog.Builder::show);
   }
 
   public static void showUnblockFor(@NonNull Context context,
@@ -55,11 +57,11 @@ public final class BlockUnblockDialog {
   private static AlertDialog.Builder buildBlockFor(@NonNull Context context,
                                                    @NonNull Recipient recipient,
                                                    @NonNull Runnable onBlock,
-                                                   @Nullable Runnable onBlockAndDelete)
+                                                   @Nullable Runnable onBlockAndReportSpam)
   {
     recipient = recipient.resolve();
 
-    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    AlertDialog.Builder builder   = new MaterialAlertDialogBuilder(context);
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
@@ -78,10 +80,10 @@ public final class BlockUnblockDialog {
       builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
       builder.setMessage(R.string.BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages);
 
-      if (onBlockAndDelete != null) {
+      if (onBlockAndReportSpam != null) {
         builder.setNeutralButton(android.R.string.cancel, null);
-        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_delete, (d, w) -> onBlockAndDelete.run());
-        builder.setNegativeButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
+        builder.setNegativeButton(R.string.BlockUnblockDialog_report_spam_and_block, (d, w) -> onBlockAndReportSpam.run());
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
       } else {
         builder.setPositiveButton(R.string.BlockUnblockDialog_block, ((dialog, which) -> onBlock.run()));
         builder.setNegativeButton(android.R.string.cancel, null);
@@ -98,7 +100,7 @@ public final class BlockUnblockDialog {
   {
     recipient = recipient.resolve();
 
-    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    AlertDialog.Builder builder   = new MaterialAlertDialogBuilder(context);
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {

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

@@ -12,11 +12,10 @@ 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.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
-import org.thoughtcrime.securesms.database.PushDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -95,7 +94,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
       {
         @Override
         protected Void doInBackground(Void... params) {
-          try (SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+          try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
             SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
             TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
 

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

@@ -26,11 +26,12 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 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;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
@@ -65,8 +66,8 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
-      int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
-                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
+      int displayMode = Util.isDefaultSmsProvider(this) ? DisplayMode.FLAG_ALL
+                                                        : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }
 

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

@@ -114,6 +114,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public static final String HIDE_COUNT        = "hide_count";
   public static final String CAN_SELECT_SELF   = "can_select_self";
   public static final String DISPLAY_CHIPS     = "display_chips";
+  public static final String RV_PADDING_BOTTOM = "recycler_view_padding_bottom";
+  public static final String RV_CLIP           = "recycler_view_clipping";
 
   private ConstraintLayout                            constraintLayout;
   private TextView                                    emptyText;
@@ -245,6 +247,15 @@ public final class ContactSelectionListFragment extends LoggingFragment
     Intent intent    = requireActivity().getIntent();
     Bundle arguments = safeArguments();
 
+    int     recyclerViewPadBottom = arguments.getInt(RV_PADDING_BOTTOM, intent.getIntExtra(RV_PADDING_BOTTOM, -1));
+    boolean recyclerViewClipping  = arguments.getBoolean(RV_CLIP, intent.getBooleanExtra(RV_CLIP, true));
+
+    if (recyclerViewPadBottom != -1) {
+      ViewUtil.setPaddingBottom(recyclerView, recyclerViewPadBottom);
+    }
+
+    recyclerView.setClipToPadding(recyclerViewClipping);
+
     swipeRefresh.setEnabled(arguments.getBoolean(REFRESHABLE, intent.getBooleanExtra(REFRESHABLE, true)));
 
     hideCount      = arguments.getBoolean(HIDE_COUNT, intent.getBooleanExtra(HIDE_COUNT, false));

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

@@ -16,6 +16,7 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 
 import org.signal.core.util.ThreadUtil;
@@ -27,6 +28,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
@@ -47,7 +49,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
 
   private static final String TAG = Log.tag(DeviceActivity.class);
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
   private DeviceAddFragment  deviceAddFragment;
@@ -62,9 +64,14 @@ public class DeviceActivity extends PassphraseRequiredActivity
 
   @Override
   public void onCreate(Bundle bundle, boolean ready) {
-    getSupportActionBar().setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24));
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
+    setContentView(R.layout.device_activity);
+
+    Toolbar toolbar = findViewById(R.id.toolbar);
+
+    setSupportActionBar(toolbar);
+    requireSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    requireSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
+
     this.deviceAddFragment  = new DeviceAddFragment();
     this.deviceListFragment = new DeviceListFragment();
     this.deviceLinkFragment = new DeviceLinkFragment();
@@ -73,20 +80,10 @@ public class DeviceActivity extends PassphraseRequiredActivity
     this.deviceAddFragment.setScanListener(this);
 
     if (getIntent().getBooleanExtra("add", false)) {
-      initFragment(android.R.id.content, deviceAddFragment, dynamicLanguage.getCurrentLocale());
+      initFragment(R.id.fragment_container, deviceAddFragment, dynamicLanguage.getCurrentLocale());
     } else {
-      initFragment(android.R.id.content, deviceListFragment, dynamicLanguage.getCurrentLocale());
+      initFragment(R.id.fragment_container, deviceListFragment, dynamicLanguage.getCurrentLocale());
     }
-
-    overridePendingTransition(R.anim.slide_from_end, R.anim.slide_to_start);
-  }
-
-  @Override
-  protected void onPause() {
-    if (isFinishing()) {
-      overridePendingTransition(R.anim.slide_from_start, R.anim.slide_to_end);
-    }
-    super.onPause();
   }
 
   @Override
@@ -98,8 +95,9 @@ public class DeviceActivity extends PassphraseRequiredActivity
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
+    if (item.getItemId() == android.R.id.home) {
+      finish();
+      return true;
     }
 
     return false;
@@ -113,7 +111,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
                .withPermanentDenialDialog(getString(R.string.DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code))
                .onAllGranted(() -> {
                  getSupportFragmentManager().beginTransaction()
-                                            .replace(android.R.id.content, deviceAddFragment)
+                                            .replace(R.id.fragment_container, deviceAddFragment)
                                             .addToBackStack(null)
                                             .commitAllowingStateLoss();
                })
@@ -128,7 +126,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
       Uri uri = Uri.parse(data);
       deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      if (Build.VERSION.SDK_INT >= 21) {
         deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
         deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
 
@@ -138,14 +136,14 @@ public class DeviceActivity extends PassphraseRequiredActivity
         getSupportFragmentManager().beginTransaction()
                                    .addToBackStack(null)
                                    .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
-                                   .replace(android.R.id.content, deviceLinkFragment)
+                                   .replace(R.id.fragment_container, deviceLinkFragment)
                                    .commit();
 
       } else {
         getSupportFragmentManager().beginTransaction()
                                    .setCustomAnimations(R.anim.slide_from_bottom, R.anim.slide_to_bottom,
                                                         R.anim.slide_from_bottom, R.anim.slide_to_bottom)
-                                   .replace(android.R.id.content, deviceLinkFragment)
+                                   .replace(R.id.fragment_container, deviceLinkFragment)
                                    .addToBackStack(null)
                                    .commit();
       }

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

@@ -42,9 +42,9 @@ public class DeviceAddFragment extends LoggingFragment {
       this.overlay.setOrientation(LinearLayout.VERTICAL);
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    if (Build.VERSION.SDK_INT >= 21) {
       this.container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+        @TargetApi(21)
         @Override
         public void onLayoutChange(View v, int left, int top, int right, int bottom,
                                    int oldLeft, int oldTop, int oldRight, int oldBottom)
@@ -80,7 +80,7 @@ public class DeviceAddFragment extends LoggingFragment {
   }
 
   @Override
-  public void onConfigurationChanged(Configuration newConfiguration) {
+  public void onConfigurationChanged(@NonNull Configuration newConfiguration) {
     super.onConfigurationChanged(newConfiguration);
 
     this.scannerView.onPause();
@@ -107,6 +107,4 @@ public class DeviceAddFragment extends LoggingFragment {
       this.scanningThread.setScanListener(scanListener);
     }
   }
-
-
 }

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

@@ -32,7 +32,7 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
   }
 
   @Override
-  public void onConfigurationChanged(Configuration newConfiguration) {
+  public void onConfigurationChanged(@NonNull Configuration newConfiguration) {
     super.onConfigurationChanged(newConfiguration);
     if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
       container.setOrientation(LinearLayout.HORIZONTAL);

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

@@ -21,6 +21,7 @@ import androidx.fragment.app.ListFragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.melnykov.fab.FloatingActionButton;
 
 import org.signal.core.util.logging.Log;
@@ -52,12 +53,12 @@ public class DeviceListFragment extends ListFragment
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
+    this.locale = (Locale) requireArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
   }
 
   @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
+  public void onAttach(@NonNull Context context) {
+    super.onAttach(context);
     this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
   }
 
@@ -121,42 +122,22 @@ public class DeviceListFragment extends ListFragment
     final String deviceName = ((DeviceListItem)view).getDeviceName();
     final long   deviceId   = ((DeviceListItem)view).getDeviceId();
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
+    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireActivity());
+    builder.setTitle(getString(R.string.DeviceListActivity_unlink_s, deviceName));
     builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
     builder.setNegativeButton(android.R.string.cancel, null);
-    builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        handleDisconnectDevice(deviceId);
-      }
-    });
+    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> handleDisconnectDevice(deviceId));
     builder.show();
   }
 
   private void handleLoaderFailed() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireActivity());
     builder.setMessage(R.string.DeviceListActivity_network_connection_failed);
     builder.setPositiveButton(R.string.DeviceListActivity_try_again,
-                              new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
-      }
-    });
+        (dialog, which) -> getLoaderManager().restartLoader(0, null, DeviceListFragment.this));
 
-    builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        DeviceListFragment.this.getActivity().onBackPressed();
-      }
-    });
-    builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        DeviceListFragment.this.getActivity().onBackPressed();
-      }
-    });
+    builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> requireActivity().onBackPressed());
+    builder.setOnCancelListener(dialog -> requireActivity().onBackPressed());
 
     builder.show();
   }

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

@@ -1,103 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.util.ExpirationUtil;
-
-import java.util.Arrays;
-
-import cn.carbswang.android.numberpickerview.library.NumberPickerView;
-
-public class ExpirationDialog extends AlertDialog {
-
-  protected ExpirationDialog(Context context) {
-    super(context);
-  }
-
-  protected ExpirationDialog(Context context, int theme) {
-    super(context, theme);
-  }
-
-  protected ExpirationDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
-    super(context, cancelable, cancelListener);
-  }
-
-  public static void show(final Context context,
-                          final int currentExpiration,
-                          final @NonNull OnClickListener listener)
-  {
-    final View view = createNumberPickerView(context, currentExpiration);
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(context.getString(R.string.ExpirationDialog_disappearing_messages));
-    builder.setView(view);
-    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-      int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
-      listener.onClick(getExpirationTimes(context, currentExpiration)[selected]);
-    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
-  private static View createNumberPickerView(final Context context, final int currentExpiration) {
-    final LayoutInflater   inflater                = LayoutInflater.from(context);
-    final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
-    final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
-    final TextView         textView                = view.findViewById(R.id.expiration_details);
-    final int[]            expirationTimes         = getExpirationTimes(context, currentExpiration);
-    final String[]         expirationDisplayValues = new String[expirationTimes.length];
-
-    int selectedIndex = expirationTimes.length - 1;
-
-    for (int i=0;i<expirationTimes.length;i++) {
-      expirationDisplayValues[i] = ExpirationUtil.getExpirationDisplayValue(context, expirationTimes[i]);
-
-      if ((currentExpiration >= expirationTimes[i]) &&
-          (i == expirationTimes.length -1 || currentExpiration < expirationTimes[i+1])) {
-        selectedIndex = i;
-      }
-    }
-
-    numberPickerView.setDisplayedValues(expirationDisplayValues);
-    numberPickerView.setMinValue(0);
-    numberPickerView.setMaxValue(expirationTimes.length-1);
-
-    NumberPickerView.OnValueChangeListener listener = (picker, oldVal, newVal) -> {
-      if (newVal == 0) {
-        textView.setText(R.string.ExpirationDialog_your_messages_will_not_expire);
-      } else {
-        textView.setText(context.getString(R.string.ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen, picker.getDisplayedValues()[newVal]));
-      }
-    };
-
-    numberPickerView.setOnValueChangedListener(listener);
-    numberPickerView.setValue(selectedIndex);
-    listener.onValueChange(numberPickerView, selectedIndex, selectedIndex);
-
-    return view;
-  }
-
-  private static int[] getExpirationTimes(Context context, int currentExpiration) {
-    int[] expirationTimes = context.getResources().getIntArray(R.array.expiration_times);
-    int   location        = Arrays.binarySearch(expirationTimes, currentExpiration);
-    if (location < 0) {
-      int[] temp = Arrays.copyOf(expirationTimes, expirationTimes.length + 1);
-      temp[temp.length - 1] = currentExpiration;
-      Arrays.sort(temp);
-      expirationTimes = temp;
-    }
-
-    return expirationTimes;
-  }
-
-  public interface OnClickListener {
-    public void onClick(int expirationTime);
-  }
-
-}

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

@@ -9,6 +9,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity;
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
@@ -69,8 +71,7 @@ public class MainNavigator {
   }
 
   public void goToAppSettings() {
-    Intent intent = new Intent(activity, ApplicationPreferencesActivity.class);
-    activity.startActivityForResult(intent, REQUEST_CONFIG_CHANGES);
+    activity.startActivityForResult(AppSettingsActivity.home(activity), REQUEST_CONFIG_CHANGES);
   }
 
   public void goToArchiveList() {

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

@@ -103,6 +103,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   public static final String HIDE_ALL_MEDIA_EXTRA = "came_from_all_media";
   public static final String SHOW_THREAD_EXTRA    = "show_thread";
   public static final String SORTING_EXTRA        = "sorting";
+  public static final String IS_VIDEO_GIF         = "is_video_gif";
 
   private ViewPager             mediaPager;
   private View                  detailsContainer;
@@ -115,6 +116,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   private String                initialMediaType;
   private long                  initialMediaSize;
   private String                initialCaption;
+  private boolean               initialMediaIsVideoGif;
   private boolean               leftIsRecent;
   private MediaPreviewViewModel viewModel;
   private ViewPagerListener     viewPagerListener;
@@ -139,6 +141,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
     intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
     intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
+    intent.putExtra(MediaPreviewActivity.IS_VIDEO_GIF, attachment.isVideoGif());
     intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
     return intent;
   }
@@ -296,12 +299,13 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     showThread       = intent.getBooleanExtra(SHOW_THREAD_EXTRA, false);
     sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(SORTING_EXTRA, 0)];
 
-    initialMediaUri  = intent.getData();
-    initialMediaType = intent.getType();
-    initialMediaSize = intent.getLongExtra(SIZE_EXTRA, 0);
-    initialCaption   = intent.getStringExtra(CAPTION_EXTRA);
-    leftIsRecent     = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
-    restartItem      = -1;
+    initialMediaUri        = intent.getData();
+    initialMediaType       = intent.getType();
+    initialMediaSize       = intent.getLongExtra(SIZE_EXTRA, 0);
+    initialCaption         = intent.getStringExtra(CAPTION_EXTRA);
+    leftIsRecent           = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
+    initialMediaIsVideoGif = intent.getBooleanExtra(IS_VIDEO_GIF, false);
+    restartItem            = -1;
   }
 
   private void initializeObservers() {
@@ -354,7 +358,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     if (isMediaInDb()) {
       LoaderManager.getInstance(this).restartLoader(0, null, this);
     } else {
-      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize));
+      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize, initialMediaIsVideoGif));
 
       if (initialCaption != null) {
         detailsContainer.setVisibility(View.VISIBLE);
@@ -632,21 +636,24 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
   private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
 
-    private final Uri    uri;
-    private final String mediaType;
-    private final long   size;
+    private final Uri     uri;
+    private final String  mediaType;
+    private final long    size;
+    private final boolean isVideoGif;
 
     private MediaPreviewFragment mediaPreviewFragment;
 
     SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
                            @NonNull Uri uri,
                            @NonNull String mediaType,
-                           long size)
+                           long size,
+                           boolean isVideoGif)
     {
       super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.uri       = uri;
-      this.mediaType = mediaType;
-      this.size      = size;
+      this.uri        = uri;
+      this.mediaType  = mediaType;
+      this.size       = size;
+      this.isVideoGif = isVideoGif;
     }
 
     @Override
@@ -657,7 +664,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     @NonNull
     @Override
     public Fragment getItem(int position) {
-      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true);
+      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true, isVideoGif);
       return mediaPreviewFragment;
     }
 

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

@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.concurrent.TimeUnit;
 
 public class MuteDialog extends AlertDialog {
@@ -29,7 +31,7 @@ public class MuteDialog extends AlertDialog {
   }
 
   public static void show(final Context context, final @NonNull MuteSelectionListener listener, @Nullable Runnable cancelListener) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
     builder.setTitle(R.string.MuteDialog_mute_notifications);
     builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
       @Override

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

@@ -166,7 +166,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       return STATE_UI_BLOCKING_UPGRADE;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_WELCOME_PUSH_SCREEN;
-    } else if (SignalStore.storageServiceValues().needsAccountRestore()) {
+    } else if (SignalStore.storageService().needsAccountRestore()) {
       return STATE_ENTER_SIGNAL_PIN;
     } else if (userMustSetProfileName()) {
       return STATE_CREATE_PROFILE_NAME;

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

@@ -29,7 +29,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -63,9 +62,8 @@ 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.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -87,16 +85,13 @@ import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.WindowUtil;
 import org.whispersystems.libsignal.IdentityKey;
 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;
 
@@ -218,12 +213,6 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
-  private void setActionBarNotificationBarColor(MaterialColor color) {
-    getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
-
-    WindowUtil.setStatusBarColor(getWindow(), color.toStatusBarColor(this));
-  }
-
   public static class VerifyDisplayFragment extends Fragment implements CompoundButton.OnCheckedChangeListener {
 
     public static final String RECIPIENT_ID    = "recipient_id";
@@ -420,11 +409,9 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
         } else {
           Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal, Toast.LENGTH_LONG).show();
         }
-      } catch (FingerprintParsingException e) {
+      } catch (Exception e) {
         Log.w(TAG, e);
         Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number, Toast.LENGTH_LONG).show();
-      } catch (UnsupportedEncodingException e) {
-        throw new AssertionError(e);
       }
     }
 
@@ -623,7 +610,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
       final RecipientId recipientId = recipient.getId();
 
       SignalExecutors.BOUNDED.execute(() -> {
-        try (SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+        try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
           if (isChecked) {
             Log.i(TAG, "Saving identity: " + recipientId);
             DatabaseFactory.getIdentityDatabase(getActivity())

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

@@ -44,6 +44,7 @@ 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.webrtc.CallToastPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
@@ -62,11 +63,15 @@ import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 
 import java.util.List;
 
+import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;
+
 public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback {
 
   private static final String TAG = Log.tag(WebRtcCallActivity.class);
@@ -253,7 +258,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
     viewModel.getEvents().observe(this, this::handleViewModelEvent);
     viewModel.getCallTime().observe(this, this::handleCallTime);
-    viewModel.getCallParticipantsState().observe(this, callScreen::updateCallParticipants);
+    LiveDataUtil.combineLatest(viewModel.getCallParticipantsState(), viewModel.getOrientation(), (s, o) -> new Pair<>(s, o == PORTRAIT_BOTTOM_EDGE))
+                .observe(this, p -> callScreen.updateCallParticipants(p.first(), p.second()));
     viewModel.getCallParticipantListUpdate().observe(this, participantUpdateWindow::addCallParticipantListUpdate);
     viewModel.getSafetyNumberChangeEvent().observe(this, this::handleSafetyNumberChangeEvent);
     viewModel.getGroupMembers().observe(this, unused -> updateGroupMembersForGroupCall());
@@ -291,6 +297,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
       SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
       return;
+    } else if (event instanceof WebRtcCallViewModel.Event.SwitchToSpeaker) {
+      callScreen.switchToSpeakerView();
+      return;
+    } else if (event instanceof WebRtcCallViewModel.Event.ShowSwipeToSpeakerHint) {
+      CallToastPopupWindow.show(callScreen);
+      return;
     }
 
     if (isInPipMode()) {

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/AlphaTransition.kt

@@ -0,0 +1,44 @@
+package org.thoughtcrime.securesms.animation.transitions
+
+import android.animation.Animator
+import android.animation.ObjectAnimator
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.transition.Transition
+import androidx.transition.TransitionValues
+
+private const val ALPHA = "signal.alpha_transition.alpha"
+
+/**
+ * Alpha transition that can be used with [ConstraintLayout]
+ */
+class AlphaTransition : Transition() {
+
+  override fun captureStartValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  override fun captureEndValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  private fun captureValues(transitionValues: TransitionValues) {
+    val view: View = transitionValues.view
+    if (view !is ConstraintLayout) {
+      transitionValues.values[ALPHA] = view.alpha
+    }
+  }
+
+  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
+    if (startValues == null || endValues == null) {
+      return null
+    }
+
+    val view: View = endValues.view
+    val startAlpha: Float = startValues.values[ALPHA] as? Float ?: view.alpha
+    val endAlpha: Float = endValues.values[ALPHA] as? Float ?: view.alpha
+
+    return ObjectAnimator.ofFloat(view, "alpha", startAlpha, endAlpha)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleAvatarTransition.kt

@@ -0,0 +1,97 @@
+package org.thoughtcrime.securesms.animation.transitions
+
+import android.animation.Animator
+import android.animation.ObjectAnimator
+import android.animation.PropertyValuesHolder
+import android.animation.TypeEvaluator
+import android.content.Context
+import android.transition.Transition
+import android.transition.TransitionValues
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.Interpolator
+import androidx.annotation.RequiresApi
+import org.thoughtcrime.securesms.components.AvatarImageView
+
+private const val POSITION_ON_SCREEN = "signal.circleavatartransition.positiononscreen"
+private const val WIDTH = "signal.circleavatartransition.width"
+private const val HEIGHT = "signal.circleavatartransition.height"
+
+/**
+ * Custom transition for Circular avatars, because once you have multiple things animating stuff was getting broken and weird.
+ */
+@RequiresApi(21)
+class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
+  override fun captureStartValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  override fun captureEndValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  private fun captureValues(transitionValues: TransitionValues) {
+    val view: View = transitionValues.view
+
+    if (view is AvatarImageView) {
+      val topLeft = intArrayOf(0, 0)
+      view.getLocationOnScreen(topLeft)
+      transitionValues.values[POSITION_ON_SCREEN] = topLeft
+      transitionValues.values[WIDTH] = view.measuredWidth
+      transitionValues.values[HEIGHT] = view.measuredHeight
+    }
+  }
+
+  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
+    if (startValues == null || endValues == null) {
+      return null
+    }
+
+    val view: View = endValues.view
+    if (view !is AvatarImageView || view.transitionName != "avatar") {
+      return null
+    }
+
+    val startCoords: IntArray = startValues.values[POSITION_ON_SCREEN] as? IntArray ?: intArrayOf(0, 0).apply { view.getLocationOnScreen(this) }
+    val endCoords: IntArray = endValues.values[POSITION_ON_SCREEN] as? IntArray ?: intArrayOf(0, 0).apply { view.getLocationOnScreen(this) }
+
+    val startWidth: Int = startValues.values[WIDTH] as? Int ?: view.measuredWidth
+    val endWidth: Int = endValues.values[WIDTH] as? Int ?: view.measuredWidth
+
+    val startHeight: Int = startValues.values[HEIGHT] as? Int ?: view.measuredHeight
+    val endHeight: Int = endValues.values[HEIGHT] as? Int ?: view.measuredHeight
+
+    val startHeightOffset = (endHeight - startHeight) / 2f
+    val startWidthOffset = (endWidth - startWidth) / 2f
+
+    val translateXHolder = PropertyValuesHolder.ofFloat("translationX", startCoords[0] - endCoords[0] - startWidthOffset, 0f).apply {
+      setEvaluator(FloatInterpolatorEvaluator(DecelerateInterpolator()))
+    }
+    val translateYHolder = PropertyValuesHolder.ofFloat("translationY", startCoords[1] - endCoords[1] - startHeightOffset, 0f).apply {
+      setEvaluator(FloatInterpolatorEvaluator(AccelerateInterpolator()))
+    }
+
+    val widthRatio = startWidth.toFloat() / endWidth
+    val scaleXHolder = PropertyValuesHolder.ofFloat("scaleX", widthRatio, 1f)
+
+    val heightRatio = startHeight.toFloat() / endHeight
+    val scaleYHolder = PropertyValuesHolder.ofFloat("scaleY", heightRatio, 1f)
+
+    return ObjectAnimator.ofPropertyValuesHolder(view, translateXHolder, translateYHolder, scaleXHolder, scaleYHolder)
+  }
+
+  private class FloatInterpolatorEvaluator(
+    private val interpolator: Interpolator
+  ) : TypeEvaluator<Float> {
+
+    override fun evaluate(fraction: Float, startValue: Float, endValue: Float): Float {
+      val interpolatedFraction = interpolator.getInterpolation(fraction)
+      val delta = endValue - startValue
+
+      return delta * interpolatedFraction + startValue
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/WipeDownTransition.kt

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.animation.transitions
+
+import android.animation.Animator
+import android.animation.ObjectAnimator
+import android.animation.RectEvaluator
+import android.content.Context
+import android.graphics.Rect
+import android.transition.Transition
+import android.transition.TransitionValues
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.RequiresApi
+import androidx.core.animation.addListener
+import androidx.fragment.app.FragmentContainerView
+
+private const val BOUNDS = "signal.wipedowntransition.bottom"
+
+/**
+ * WipeDownTransition will animate the bottom position of a view such that it "wipes" down the screen to a final position.
+ */
+@RequiresApi(21)
+class WipeDownTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
+  override fun captureStartValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  override fun captureEndValues(transitionValues: TransitionValues) {
+    captureValues(transitionValues)
+  }
+
+  private fun captureValues(transitionValues: TransitionValues) {
+    val view: View = transitionValues.view
+
+    if (view is ViewGroup) {
+      val rect = Rect()
+      view.getLocalVisibleRect(rect)
+      transitionValues.values[BOUNDS] = rect
+    }
+  }
+
+  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
+    if (startValues == null || endValues == null) {
+      return null
+    }
+
+    val view: View = endValues.view
+    if (view !is FragmentContainerView) {
+      return null
+    }
+
+    val startBottom: Rect = startValues.values[BOUNDS] as? Rect ?: Rect().apply { view.getLocalVisibleRect(this) }
+    val endBottom: Rect = endValues.values[BOUNDS] as? Rect ?: Rect().apply { view.getLocalVisibleRect(this) }
+
+    return ObjectAnimator.ofObject(view, "clipBounds", RectEvaluator(), startBottom, endBottom).apply {
+      addListener(
+        onEnd = {
+          view.clipBounds = null
+        }
+      )
+    }
+  }
+}

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

@@ -40,6 +40,7 @@ public abstract class Attachment {
 
   private final boolean voiceNote;
   private final boolean borderless;
+  private final boolean videoGif;
   private final int     width;
   private final int     height;
   private final boolean quote;
@@ -72,6 +73,7 @@ public abstract class Attachment {
                     @Nullable String fastPreflightId,
                     boolean voiceNote,
                     boolean borderless,
+                    boolean videoGif,
                     int width,
                     int height,
                     boolean quote,
@@ -94,6 +96,7 @@ public abstract class Attachment {
     this.fastPreflightId     = fastPreflightId;
     this.voiceNote           = voiceNote;
     this.borderless          = borderless;
+    this.videoGif            = videoGif;
     this.width               = width;
     this.height              = height;
     this.quote               = quote;
@@ -170,6 +173,10 @@ public abstract class Attachment {
     return borderless;
   }
 
+  public boolean isVideoGif() {
+    return videoGif;
+  }
+
   public int getWidth() {
     return width;
   }

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

@@ -36,6 +36,7 @@ public class DatabaseAttachment extends Attachment {
                             String fastPreflightId,
                             boolean voiceNote,
                             boolean borderless,
+                            boolean videoGif,
                             int width,
                             int height,
                             boolean quote,
@@ -47,7 +48,7 @@ public class DatabaseAttachment extends Attachment {
                             int displayOrder,
                             long uploadTimestamp)
   {
-    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;

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

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

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

@@ -30,6 +30,7 @@ public class PointerAttachment extends Attachment {
                             @Nullable String fastPreflightId,
                             boolean voiceNote,
                             boolean borderless,
+                            boolean videoGif,
                             int width,
                             int height,
                             long uploadTimestamp,
@@ -37,7 +38,7 @@ public class PointerAttachment extends Attachment {
                             @Nullable StickerLocator stickerLocator,
                             @Nullable BlurHash blurHash)
   {
-    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, videoGif, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
   }
 
   @Nullable
@@ -111,6 +112,7 @@ public class PointerAttachment extends Attachment {
                                              fastPreflightId,
                                              pointer.get().asPointer().getVoiceNote(),
                                              pointer.get().asPointer().isBorderless(),
+                                             pointer.get().asPointer().isGif(),
                                              pointer.get().asPointer().getWidth(),
                                              pointer.get().asPointer().getHeight(),
                                              pointer.get().asPointer().getUploadTimestamp(),
@@ -135,6 +137,7 @@ public class PointerAttachment extends Attachment {
                                              null,
                                              false,
                                              false,
+                                             false,
                                              thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,

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

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

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

@@ -21,6 +21,7 @@ public class UriAttachment extends Attachment {
                        @Nullable String fileName,
                        boolean voiceNote,
                        boolean borderless,
+                       boolean videoGif,
                        boolean quote,
                        @Nullable String caption,
                        @Nullable StickerLocator stickerLocator,
@@ -28,7 +29,7 @@ public class UriAttachment extends Attachment {
                        @Nullable AudioHash audioHash,
                        @Nullable TransformProperties transformProperties)
   {
-    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, videoGif, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
   }
 
   public UriAttachment(@NonNull Uri dataUri,
@@ -41,6 +42,7 @@ public class UriAttachment extends Attachment {
                        @Nullable String fastPreflightId,
                        boolean voiceNote,
                        boolean borderless,
+                       boolean videoGif,
                        boolean quote,
                        @Nullable String caption,
                        @Nullable StickerLocator stickerLocator,
@@ -48,7 +50,7 @@ public class UriAttachment extends Attachment {
                        @Nullable AudioHash audioHash,
                        @Nullable TransformProperties transformProperties)
   {
-    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.dataUri = dataUri;
   }
 

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

@@ -74,7 +74,7 @@ public class BackupDialog {
 
           BackupPassphrase.set(context, Util.join(password, " "));
           TextSecurePreferences.setNextBackupTime(context, 0);
-          TextSecurePreferences.setBackupEnabled(context, true);
+          SignalStore.settings().setBackupEnabled(true);
           LocalBackupListener.schedule(context);
 
           onBackupsEnabled.run();

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

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.backup;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -11,8 +10,8 @@ import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.notifications.NotificationCancellationHelper;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 
@@ -39,11 +38,7 @@ public enum BackupFileIOError {
   }
 
   public void postNotification(@NonNull Context context) {
-    Intent intent = new Intent(context, ApplicationPreferencesActivity.class);
-
-    intent.putExtra(ApplicationPreferencesActivity.LAUNCH_TO_BACKUPS_FRAGMENT, true);
-
-    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, intent, 0);
+    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), 0);
     Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.FAILURES)
                                                                   .setSmallIcon(R.drawable.ic_signal_backup)
                                                                   .setContentTitle(context.getString(titleId))

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

@@ -24,12 +24,16 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
+import org.thoughtcrime.securesms.database.PendingRetryReceiptDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
+import org.thoughtcrime.securesms.database.SenderKeyDatabase;
+import org.thoughtcrime.securesms.database.SenderKeySharedDatabase;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
@@ -38,6 +42,7 @@ 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.service.PendingRetryReceiptManager;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -75,7 +80,11 @@ public class FullBackupExporter extends FullBackupBase {
     OneTimePreKeyDatabase.TABLE_NAME,
     SessionDatabase.TABLE_NAME,
     SearchDatabase.SMS_FTS_TABLE_NAME,
-    SearchDatabase.MMS_FTS_TABLE_NAME
+    SearchDatabase.MMS_FTS_TABLE_NAME,
+    EmojiSearchDatabase.TABLE_NAME,
+    SenderKeyDatabase.TABLE_NAME,
+    SenderKeySharedDatabase.TABLE_NAME,
+    PendingRetryReceiptDatabase.TABLE_NAME
   );
 
   public static void export(@NonNull Context context,
@@ -210,11 +219,11 @@ public class FullBackupExporter extends FullBackupBase {
         String type = cursor.getString(2);
 
         if (sql != null) {
+          boolean isSmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
+          boolean isMmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
+          boolean isEmojiFtsSecretTable = name != null && !name.equals(EmojiSearchDatabase.TABLE_NAME) && name.startsWith(EmojiSearchDatabase.TABLE_NAME);
 
-          boolean isSmsFtsSecretTable = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
-          boolean isMmsFtsSecretTable = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
-
-          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable) {
+          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable && !isEmojiFtsSecretTable) {
             if ("table".equals(type)) {
               tables.add(name);
             }

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

@@ -26,6 +26,7 @@ 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.EmojiSearchDatabase;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
@@ -136,9 +137,10 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processStatement(@NonNull SQLiteDatabase db, SqlStatement statement) {
     boolean isForSmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.SMS_FTS_TABLE_NAME + "_");
     boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.MMS_FTS_TABLE_NAME + "_");
+    boolean isForEmojiSecretTable  = statement.getStatement().contains(EmojiSearchDatabase.TABLE_NAME + "_");
     boolean isForSqliteSecretTable = statement.getStatement().toLowerCase().startsWith("create table sqlite_");
 
-    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForSqliteSecretTable) {
+    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForEmojiSecretTable || isForSqliteSecretTable) {
       Log.i(TAG, "Ignoring import for statement: " + statement.getStatement());
       return;
     }

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

@@ -91,14 +91,14 @@ public enum MaterialColor {
   }
 
   public @ColorRes int toQuoteBarColorResource(@NonNull Context context, boolean outgoing) {
-    if (outgoing) {
+    if (!outgoing) {
       return isDarkTheme(context) ? tintColor : shadeColor ;
     }
     return R.color.core_white;
   }
 
   public @ColorInt int toQuoteBackgroundColor(@NonNull Context context, boolean outgoing) {
-    if (outgoing) {
+    if (!outgoing) {
       int color = toConversationColor(context);
       int alpha = isDarkTheme(context) ? (int) (0.2 * 255) : (int) (0.4 * 255);
       return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
@@ -108,7 +108,7 @@ public enum MaterialColor {
   }
 
   public @ColorInt int toQuoteFooterColor(@NonNull Context context, boolean outgoing) {
-    if (outgoing) {
+    if (!outgoing) {
       int color = toConversationColor(context);
       int alpha = isDarkTheme(context) ? (int) (0.4 * 255) : (int) (0.6 * 255);
       return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));

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

@@ -69,4 +69,10 @@ public class AlertView extends LinearLayout {
     approvalIndicator.setVisibility(View.GONE);
     failedIndicator.setVisibility(View.VISIBLE);
   }
+
+  public void setRateLimited() {
+    this.setVisibility(View.VISIBLE);
+    approvalIndicator.setVisibility(View.VISIBLE);
+    failedIndicator.setVisibility(View.GONE);
+  }
 }

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

@@ -2,37 +2,51 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.FragmentActivity;
 
+import com.bumptech.glide.load.MultiTransformation;
+import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
 
 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;
+import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
+import org.thoughtcrime.securesms.conversation.colors.ChatColors;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
-import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 import org.thoughtcrime.securesms.util.AvatarUtil;
+import org.thoughtcrime.securesms.util.BlurTransformation;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public final class AvatarImageView extends AppCompatImageView {
@@ -63,6 +77,9 @@ public final class AvatarImageView extends AppCompatImageView {
   private Paint                           outlinePaint;
   private OnClickListener                 listener;
   private Recipient.FallbackPhotoProvider fallbackPhotoProvider;
+  private boolean                         blurred;
+  private ChatColors                      chatColors;
+  private FixedSizeTarget                 fixedSizeTarget;
 
   private @Nullable RecipientContactPhoto recipientContactPhoto;
   private @NonNull  Drawable              unknownRecipientDrawable;
@@ -82,23 +99,30 @@ public final class AvatarImageView extends AppCompatImageView {
 
     if (attrs != null) {
       TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AvatarImageView, 0, 0);
-      inverted              = typedArray.getBoolean(R.styleable.AvatarImageView_inverted, false);
-      size                  = typedArray.getInt(R.styleable.AvatarImageView_fallbackImageSize, SIZE_LARGE);
+      inverted = typedArray.getBoolean(R.styleable.AvatarImageView_inverted, false);
+      size     = typedArray.getInt(R.styleable.AvatarImageView_fallbackImageSize, SIZE_LARGE);
       typedArray.recycle();
     }
 
-    outlinePaint = ThemeUtil.isDarkTheme(getContext()) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;
+    outlinePaint = ThemeUtil.isDarkTheme(context) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;
 
-    unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(getContext(), ContactColors.UNKNOWN_COLOR.toConversationColor(getContext()), inverted);
+    unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(context, AvatarColor.UNKNOWN.colorInt(), inverted);
+    blurred                  = false;
+    chatColors               = null;
+  }
+
+  @Override
+  public void setClipBounds(Rect clipBounds) {
+    super.setClipBounds(clipBounds);
   }
 
   @Override
   protected void onDraw(Canvas canvas) {
     super.onDraw(canvas);
 
-    float width  = getWidth()  - getPaddingRight()  - getPaddingLeft();
+    float width  = getWidth() - getPaddingRight() - getPaddingLeft();
     float height = getHeight() - getPaddingBottom() - getPaddingTop();
-    float cx     = width  / 2f;
+    float cx     = width / 2f;
     float cy     = height / 2f;
     float radius = Math.min(cx, cy) - (outlinePaint.getStrokeWidth() / 2f);
 
@@ -135,6 +159,10 @@ public final class AvatarImageView extends AppCompatImageView {
     }
   }
 
+  public AvatarOptions.Builder buildOptions() {
+    return new AvatarOptions.Builder(this);
+  }
+
   /**
    * Shows self as the note to self icon.
    */
@@ -154,44 +182,78 @@ public final class AvatarImageView extends AppCompatImageView {
   }
 
   public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled, boolean useSelfProfileAvatar) {
-    if (recipient != null) {
-      RecipientContactPhoto photo = (recipient.isSelf() && useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
-                                                                                                             new ProfileContactPhoto(Recipient.self(),
-                                                                                                                                     Recipient.self().getProfileAvatar()))
-                                                                                 : new RecipientContactPhoto(recipient);
+    setAvatar(requestManager, recipient, new AvatarOptions.Builder(this)
+                                                          .withUseSelfProfileAvatar(useSelfProfileAvatar)
+                                                          .withQuickContactEnabled(quickContactEnabled)
+                                                          .build());
+  }
 
-      if (!photo.equals(recipientContactPhoto)) {
+  private void setAvatar(@Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
+    setAvatar(GlideApp.with(this), recipient, avatarOptions);
+  }
+
+  private void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
+    if (recipient != null) {
+      RecipientContactPhoto photo = (recipient.isSelf() && avatarOptions.useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
+                                                                                                                           new ProfileContactPhoto(Recipient.self(),
+                                                                                                                                                   Recipient.self().getProfileAvatar()))
+                                                                                               : new RecipientContactPhoto(recipient);
+
+      boolean    shouldBlur = recipient.shouldBlurAvatar();
+      ChatColors chatColors = recipient.getChatColors();
+
+      if (!photo.equals(recipientContactPhoto) || shouldBlur != blurred || !Objects.equals(chatColors, this.chatColors)) {
         requestManager.clear(this);
+        this.chatColors       = chatColors;
         recipientContactPhoto = photo;
 
-        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL
-            ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider)
-            : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider);
+        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider)
+                                                                   : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider);
+
+        if (fixedSizeTarget != null) {
+          requestManager.clear(fixedSizeTarget);
+        }
 
         if (photo.contactPhoto != null) {
-          requestManager.load(photo.contactPhoto)
-                        .fallback(fallbackContactPhotoDrawable)
-                        .error(fallbackContactPhotoDrawable)
-                        .diskCacheStrategy(DiskCacheStrategy.ALL)
-                        .circleCrop()
-                        .into(this);
+
+          List<Transformation<Bitmap>> transforms = new ArrayList<>();
+          if (shouldBlur) {
+            transforms.add(new BlurTransformation(ApplicationDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
+          }
+          transforms.add(new CircleCrop());
+          blurred = shouldBlur;
+
+          GlideRequest<Drawable> request = requestManager.load(photo.contactPhoto)
+                                                         .fallback(fallbackContactPhotoDrawable)
+                                                         .error(fallbackContactPhotoDrawable)
+                                                         .diskCacheStrategy(DiskCacheStrategy.ALL)
+                                                         .downsample(DownsampleStrategy.CENTER_INSIDE)
+                                                         .transform(new MultiTransformation<>(transforms));
+
+          if (avatarOptions.fixedSize > 0) {
+            fixedSizeTarget = new FixedSizeTarget(avatarOptions.fixedSize);
+            request.into(fixedSizeTarget);
+          } else {
+            request.into(this);
+          }
+
         } else {
           setImageDrawable(fallbackContactPhotoDrawable);
         }
       }
 
-      setAvatarClickHandler(recipient, quickContactEnabled);
+      setAvatarClickHandler(recipient, avatarOptions.quickContactEnabled);
     } else {
       recipientContactPhoto = null;
       requestManager.clear(this);
       if (fallbackPhotoProvider != null) {
         setImageDrawable(fallbackPhotoProvider.getPhotoForRecipientWithoutName()
-                                              .asDrawable(getContext(), MaterialColor.STEEL.toAvatarColor(getContext()), inverted));
+                                              .asDrawable(getContext(), AvatarColor.UNKNOWN.colorInt(), inverted));
       } else {
         setImageDrawable(unknownRecipientDrawable);
       }
 
-      super.setOnClickListener(listener);
+      disableQuickContact();
     }
   }
 
@@ -200,15 +262,15 @@ public final class AvatarImageView extends AppCompatImageView {
       super.setOnClickListener(v -> {
         Context context = getContext();
         if (recipient.isPushGroup()) {
-          context.startActivity(ManageGroupActivity.newIntent(context, recipient.requireGroupId().requirePush()),
-                                ManageGroupActivity.createTransitionBundle(context, this));
+          context.startActivity(ConversationSettingsActivity.forGroup(context, recipient.requireGroupId().requirePush()),
+                                ConversationSettingsActivity.createTransitionBundle(context, this));
         } else {
           if (context instanceof FragmentActivity) {
             RecipientBottomSheetDialogFragment.create(recipient.getId(), null)
                                               .show(((FragmentActivity) context).getSupportFragmentManager(), "BOTTOM");
           } else {
-            context.startActivity(ManageRecipientActivity.newIntent(context, recipient.getId()),
-                                  ManageRecipientActivity.createTransitionBundle(context, this));
+            context.startActivity(ConversationSettingsActivity.forRecipient(context, recipient.getId()),
+                                  ConversationSettingsActivity.createTransitionBundle(context, this));
           }
         }
       });
@@ -219,11 +281,11 @@ public final class AvatarImageView extends AppCompatImageView {
 
   public void setImageBytesForGroup(@Nullable byte[] avatarBytes,
                                     @Nullable Recipient.FallbackPhotoProvider fallbackPhotoProvider,
-                                    @NonNull MaterialColor color)
+                                    @NonNull AvatarColor color)
   {
     Drawable fallback = Util.firstNonNull(fallbackPhotoProvider, Recipient.DEFAULT_FALLBACK_PHOTO_PROVIDER)
                             .getPhotoForGroup()
-                            .asDrawable(getContext(), color.toAvatarColor(getContext()));
+                            .asDrawable(getContext(), color.colorInt());
 
     GlideApp.with(this)
             .load(avatarBytes)
@@ -264,9 +326,70 @@ public final class AvatarImageView extends AppCompatImageView {
       if (other == null) return false;
 
       return other.recipient.equals(recipient) &&
-             other.recipient.getColor().equals(recipient.getColor()) &&
+             other.recipient.getChatColors().equals(recipient.getChatColors()) &&
              other.ready == ready &&
              Objects.equals(other.contactPhoto, contactPhoto);
     }
   }
+
+  private final class FixedSizeTarget extends SimpleTarget<Drawable> {
+
+    FixedSizeTarget(int size) {
+      super(size, size);
+    }
+
+    @Override
+    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+      setImageDrawable(resource);
+    }
+  }
+
+  public static final class AvatarOptions {
+
+    private final boolean quickContactEnabled;
+    private final boolean useSelfProfileAvatar;
+    private final int     fixedSize;
+
+    private AvatarOptions(@NonNull Builder builder) {
+      this.quickContactEnabled  = builder.quickContactEnabled;
+      this.useSelfProfileAvatar = builder.useSelfProfileAvatar;
+      this.fixedSize            = builder.fixedSize;
+    }
+
+    public static final class Builder {
+
+      private final AvatarImageView avatarImageView;
+
+      private boolean quickContactEnabled  = false;
+      private boolean useSelfProfileAvatar = false;
+      private int     fixedSize            = -1;
+
+      private Builder(@NonNull AvatarImageView avatarImageView) {
+        this.avatarImageView = avatarImageView;
+      }
+
+      public @NonNull Builder withQuickContactEnabled(boolean quickContactEnabled) {
+        this.quickContactEnabled = quickContactEnabled;
+        return this;
+      }
+
+      public @NonNull Builder withUseSelfProfileAvatar(boolean useSelfProfileAvatar) {
+        this.useSelfProfileAvatar = useSelfProfileAvatar;
+        return this;
+      }
+
+      public @NonNull Builder withFixedSize(@Px @IntRange(from = 1) int fixedSize) {
+        this.fixedSize = fixedSize;
+        return this;
+      }
+
+      public AvatarOptions build() {
+        return new AvatarOptions(this);
+      }
+
+      public void load(@Nullable Recipient recipient) {
+        avatarImageView.setAvatar(recipient, build());
+      }
+    }
+  }
 }

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

@@ -35,6 +35,7 @@ import org.thoughtcrime.securesms.components.mention.MentionDeleter;
 import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
 import org.thoughtcrime.securesms.components.mention.MentionValidatorWatcher;
 import org.thoughtcrime.securesms.database.model.Mention;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.StringUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -201,7 +202,7 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setTransport(TransportOption transport) {
-    final boolean useSystemEmoji = TextSecurePreferences.isSystemEmojiPreferred(getContext());
+    final boolean useSystemEmoji = SignalStore.settings().isPreferSystemEmoji();
 
     int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
     int inputType  = getInputType();
@@ -225,7 +226,7 @@ public class ComposeText extends EmojiEditText {
   public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
     InputConnection inputConnection = super.onCreateInputConnection(editorInfo);
 
-    if(TextSecurePreferences.isEnterSendsEnabled(getContext())) {
+    if(SignalStore.settings().isEnterKeySends()) {
       editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
 

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

@@ -4,6 +4,9 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.android.material.tabs.TabLayout;
 
 import java.util.List;
@@ -15,6 +18,8 @@ public class ControllableTabLayout extends TabLayout {
 
   private List<View> touchables;
 
+  private NewTabListener newTabListener;
+
   public ControllableTabLayout(Context context) {
     super(context);
   }
@@ -39,4 +44,28 @@ public class ControllableTabLayout extends TabLayout {
 
     super.setEnabled(enabled);
   }
+
+  public void setNewTabListener(@Nullable NewTabListener newTabListener) {
+    this.newTabListener = newTabListener;
+  }
+
+  @Override
+  public @NonNull Tab newTab() {
+    Tab tab = super.newTab();
+
+    if (newTabListener != null) {
+      newTabListener.onNewTab(tab);
+    }
+
+    return tab;
+  }
+
+  /**
+   * Allows implementor to modify tabs when they are created, before they are added to the tab layout.
+   * This is useful for loading custom views, to ensure that time is not spent inflating these views
+   * as the user is switching between pages.
+   */
+  public interface NewTabListener {
+    void onNewTab(@NonNull Tab tab);
+  }
 }

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

@@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
@@ -99,7 +100,7 @@ public class ConversationItemFooter extends LinearLayout {
     presentTimer(messageRecord);
     presentInsecureIndicator(messageRecord);
     presentDeliveryStatus(messageRecord);
-    hideAudioDurationViews();
+    presentAudioDuration(messageRecord);
   }
 
   public void setAudioDuration(long totalDurationMillis, long currentPostionMillis) {
@@ -123,7 +124,7 @@ public class ConversationItemFooter extends LinearLayout {
     revealDot.addValueCallback(
         new KeyPath("**"),
         LottieProperty.COLOR_FILTER,
-        frameInfo -> new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
+        frameInfo -> new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
     );
   }
 
@@ -146,6 +147,14 @@ public class ConversationItemFooter extends LinearLayout {
     setBackground(null);
   }
 
+  public @Nullable Projection getProjection() {
+    if (getVisibility() == VISIBLE) {
+      return Projection.relativeToViewRoot(this, new Projection.Corners(ViewUtil.dpToPx(11)));
+    } else {
+      return null;
+    }
+  }
+
   private void presentDate(@NonNull MessageRecord messageRecord, @NonNull Locale locale) {
     dateView.forceLayout();
     if (messageRecord.isFailed()) {
@@ -161,6 +170,8 @@ public class ConversationItemFooter extends LinearLayout {
       dateView.setText(errorMsg);
     } else if (messageRecord.isPendingInsecureSmsFallback()) {
       dateView.setText(R.string.ConversationItem_click_to_approve_unencrypted);
+    } else if (messageRecord.isRateLimited()) {
+      dateView.setText(R.string.ConversationItem_send_paused);
     } else {
       dateView.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));
     }
@@ -259,6 +270,12 @@ public class ConversationItemFooter extends LinearLayout {
           moveAudioViewsForIncoming();
         }
         showAudioDurationViews();
+
+        if (messageRecord.getViewedReceiptCount() > 0) {
+          revealDot.setProgress(1f);
+        } else {
+          revealDot.setProgress(0f);
+        }
       } else {
         hideAudioDurationViews();
       }
@@ -295,11 +312,8 @@ public class ConversationItemFooter extends LinearLayout {
 
   private void showAudioDurationViews() {
     audioSpace.setVisibility(View.VISIBLE);
-    audioDuration.setVisibility(View.VISIBLE);
-
-    if (FeatureFlags.viewedReceipts()) {
-      revealDot.setVisibility(View.VISIBLE);
-    }
+    audioDuration.setVisibility(View.GONE);
+    revealDot.setVisibility(View.VISIBLE);
   }
 
   private void hideAudioDurationViews() {

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

@@ -19,6 +19,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
+import org.thoughtcrime.securesms.util.Projection;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.List;
 
@@ -32,6 +34,9 @@ public class ConversationItemThumbnail extends FrameLayout {
   private Outliner               outliner;
   private Outliner               pulseOutliner;
   private boolean                borderless;
+  private int[]                  normalBounds;
+  private int[]                  gifBounds;
+  private int                    minimumThumbnailWidth;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -60,14 +65,30 @@ public class ConversationItemThumbnail extends FrameLayout {
 
     outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));
 
+    int gifWidth = ViewUtil.dpToPx(260);
     if (attrs != null) {
       TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemThumbnail, 0, 0);
-      thumbnail.setBounds(typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minWidth, 0),
-                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxWidth, 0),
-                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minHeight, 0),
-                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxHeight, 0));
+      normalBounds = new int[]{
+          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minWidth, 0),
+          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxWidth, 0),
+          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minHeight, 0),
+          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxHeight, 0)
+      };
+
+      gifWidth = typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_gifWidth, gifWidth);
       typedArray.recycle();
+    } else {
+      normalBounds = new int[]{0, 0, 0, 0};
     }
+
+    gifBounds = new int[]{
+        gifWidth,
+        gifWidth,
+        1,
+        Integer.MAX_VALUE
+    };
+
+    minimumThumbnailWidth = -1;
   }
 
   @SuppressWarnings("SuspiciousNameCombination")
@@ -88,6 +109,18 @@ public class ConversationItemThumbnail extends FrameLayout {
     }
   }
 
+  public void hideThumbnailView() {
+    thumbnail.setAlpha(0f);
+  }
+
+  public void showThumbnailView() {
+    thumbnail.setAlpha(1f);
+  }
+
+  public @NonNull Projection.Corners getCorners() {
+    return new Projection.Corners(cornerMask.getRadii());
+  }
+
   public void setPulseOutliner(@NonNull Outliner outliner) {
     this.pulseOutliner = outliner;
   }
@@ -121,6 +154,7 @@ public class ConversationItemThumbnail extends FrameLayout {
   }
 
   public void setMinimumThumbnailWidth(int width) {
+    minimumThumbnailWidth = width;
     thumbnail.setMinimumThumbnailWidth(width);
   }
 
@@ -137,6 +171,17 @@ public class ConversationItemThumbnail extends FrameLayout {
                                boolean showControls, boolean isPreview)
   {
     if (slides.size() == 1) {
+      Slide slide = slides.get(0);
+      if (slide.isVideoGif()) {
+        setThumbnailBounds(gifBounds);
+      } else {
+        setThumbnailBounds(normalBounds);
+
+        if (minimumThumbnailWidth != -1) {
+          thumbnail.setMinimumThumbnailWidth(minimumThumbnailWidth);
+        }
+      }
+
       thumbnail.setVisibility(VISIBLE);
       album.setVisibility(GONE);
 
@@ -167,4 +212,8 @@ public class ConversationItemThumbnail extends FrameLayout {
     thumbnail.setDownloadClickListener(listener);
     album.setDownloadClickListener(listener);
   }
+
+  private void setThumbnailBounds(@NonNull int[] bounds) {
+    thumbnail.setBounds(bounds[0], bounds[1], bounds[2], bounds[3]);
+  }
 }

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

@@ -4,22 +4,31 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+
+import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.whispersystems.libsignal.util.Pair;
 
+import java.util.LinkedList;
 import java.util.List;
 
-public class ConversationTypingView extends LinearLayout {
+public class ConversationTypingView extends ConstraintLayout {
 
-  private AvatarImageView     avatar;
+  private AvatarImageView     avatar1;
+  private AvatarImageView     avatar2;
+  private AvatarImageView     avatar3;
   private View                bubble;
   private TypingIndicatorView indicator;
+  private TextView            typistCount;
 
   public ConversationTypingView(Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
@@ -29,27 +38,58 @@ public class ConversationTypingView extends LinearLayout {
   protected void onFinishInflate() {
     super.onFinishInflate();
 
-    avatar    = findViewById(R.id.typing_avatar);
-    bubble    = findViewById(R.id.typing_bubble);
-    indicator = findViewById(R.id.typing_indicator);
+    avatar1     = findViewById(R.id.typing_avatar_1);
+    avatar2     = findViewById(R.id.typing_avatar_2);
+    avatar3     = findViewById(R.id.typing_avatar_3);
+    typistCount = findViewById(R.id.typing_count);
+    bubble      = findViewById(R.id.typing_bubble);
+    indicator   = findViewById(R.id.typing_indicator);
   }
 
-  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread) {
+  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread, boolean hasWallpaper) {
     if (typists.isEmpty()) {
       indicator.stopAnimation();
       return;
     }
 
-    Recipient typist = typists.get(0);
-    bubble.getBackground().setColorFilter(typist.getColor().toConversationColor(getContext()), PorterDuff.Mode.MULTIPLY);
+    avatar1.setVisibility(GONE);
+    avatar2.setVisibility(GONE);
+    avatar3.setVisibility(GONE);
+    typistCount.setVisibility(GONE);
 
     if (isGroupThread) {
-      avatar.setAvatar(glideRequests, typist, true);
-      avatar.setVisibility(VISIBLE);
+      presentGroupThreadAvatars(glideRequests, typists);
+    }
+
+    if (hasWallpaper) {
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color));
+      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color), PorterDuff.Mode.SRC_IN);
     } else {
-      avatar.setVisibility(GONE);
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary));
+      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_background_secondary), PorterDuff.Mode.SRC_IN);
     }
 
     indicator.startAnimation();
   }
+
+  private void presentGroupThreadAvatars(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists) {
+    avatar1.setAvatar(glideRequests, typists.get(0), typists.size() == 1);
+    avatar1.setVisibility(VISIBLE);
+
+    if (typists.size() > 1) {
+      avatar2.setAvatar(glideRequests, typists.get(1), false);
+      avatar2.setVisibility(VISIBLE);
+    }
+
+    if (typists.size() == 3) {
+      avatar3.setAvatar(glideRequests, typists.get(2), false);
+      avatar3.setVisibility(VISIBLE);
+    }
+
+    if (typists.size() > 3) {
+      typistCount.setText(getResources().getString(R.string.ConversationTypingView__plus_d, typists.size() - 2));
+      typistCount.setVisibility(VISIBLE);
+    }
+  }
 }
+

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

@@ -7,9 +7,11 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
+import android.graphics.drawable.shapes.RoundRectShape;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class CornerMask {
 
@@ -29,10 +31,7 @@ public class CornerMask {
   }
 
   public void mask(Canvas canvas) {
-    bounds.left   = 0;
-    bounds.top    = 0;
-    bounds.right  = canvas.getWidth();
-    bounds.bottom = canvas.getHeight();
+    bounds.set(canvas.getClipBounds());
 
     corners.reset();
     corners.addRoundRect(bounds, radii, Path.Direction.CW);
@@ -57,6 +56,13 @@ public class CornerMask {
     radii[6] = radii[7] = bottomLeft;
   }
 
+  public void setRadii(float topLeft, float topRight, float bottomRight, float bottomLeft) {
+    radii[0] = radii[1] = topLeft;
+    radii[2] = radii[3] = topRight;
+    radii[4] = radii[5] = bottomRight;
+    radii[6] = radii[7] = bottomLeft;
+  }
+
   public void setTopLeftRadius(int radius) {
     radii[0] = radii[1] = radius;
   }
@@ -72,4 +78,8 @@ public class CornerMask {
   public void setBottomLeftRadius(int radius) {
     radii[6] = radii[7] = radius;
   }
+
+  public float[] getRadii() {
+    return radii;
+  }
 }

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

@@ -1,7 +1,10 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -9,11 +12,15 @@ import android.text.style.StyleSpan;
 import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 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;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import java.util.Objects;
 
 public class FromTextView extends EmojiTextView {
 
@@ -65,10 +72,17 @@ public class FromTextView extends EmojiTextView {
 
     setText(builder);
 
-    if      (recipient.isBlocked()) setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_block_grey600_18dp, 0, 0, 0);
-    else if (recipient.isMuted())   setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_volume_off_grey600_18dp, 0, 0, 0);
+    if      (recipient.isBlocked()) setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_block_grey600_18dp, 0, 0, 0);
+    else if (recipient.isMuted())   setCompoundDrawablesRelativeWithIntrinsicBounds(getMuted(), null, null, null);
     else                            setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
   }
 
+  private Drawable getMuted() {
+    Drawable mutedDrawable = Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.ic_bell_disabled_16));
 
+    mutedDrawable.setBounds(0, 0, ViewUtil.dpToPx(18), ViewUtil.dpToPx(18));
+    mutedDrawable.setColorFilter(new PorterDuffColorFilter(ContextCompat.getColor(getContext(), R.color.signal_icon_tint_secondary), PorterDuff.Mode.SRC_IN));
+
+    return mutedDrawable;
+  }
 }

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

@@ -26,8 +26,8 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
     addOnKeyboardShownListener(this);
   }
 
-  @Override public void onKeyboardShown() {
-    hideAttachedInput(true);
+  @Override
+  public void onKeyboardShown() {
   }
 
   public void show(@NonNull final EditText imeTarget, @NonNull final InputView input) {

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

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components;
 import android.animation.Animator;
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
@@ -22,6 +23,7 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -33,7 +35,10 @@ import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.conversation.ConversationStickerSuggestionAdapter;
+import org.thoughtcrime.securesms.conversation.colors.Colorizer;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.keyboard.KeyboardPage;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -41,7 +46,6 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 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.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -49,6 +53,7 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public class InputPanel extends LinearLayout
@@ -73,7 +78,7 @@ public class InputPanel extends LinearLayout
   private View            buttonToggle;
   private View            recordingContainer;
   private View            recordLockCancel;
-  private View            composeContainer;
+  private ViewGroup       composeContainer;
 
   private MicrophoneRecorderView microphoneRecorderView;
   private SlideToCancel          slideToCancel;
@@ -124,7 +129,7 @@ public class InputPanel extends LinearLayout
 
     this.recordLockCancel.setOnClickListener(v -> microphoneRecorderView.cancelAction());
 
-    if (TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
+    if (SignalStore.settings().isPreferSystemEmoji()) {
       mediaKeyboard.setVisibility(View.GONE);
       emojiVisible = false;
     } else {
@@ -162,7 +167,7 @@ public class InputPanel extends LinearLayout
                        @NonNull CharSequence body,
                        @NonNull SlideDeck attachments)
   {
-    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments);
+    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments, null);
 
     int originalHeight = this.quoteView.getVisibility() == VISIBLE ? this.quoteView.getMeasuredHeight()
                                                                    : 0;
@@ -275,8 +280,8 @@ public class InputPanel extends LinearLayout
     mediaKeyboard.setVisibility(show ? View.VISIBLE : GONE);
   }
 
-  public void setMediaKeyboardToggleMode(boolean isSticker) {
-    mediaKeyboard.setStickerMode(isSticker);
+  public void setMediaKeyboardToggleMode(@NonNull KeyboardPage page) {
+    mediaKeyboard.setStickerMode(page);
   }
 
   public boolean isStickerMode() {
@@ -287,13 +292,17 @@ public class InputPanel extends LinearLayout
     return mediaKeyboard;
   }
 
+  public MediaKeyboard.MediaKeyboardListener getMediaKeyboardListener() {
+    return mediaKeyboard;
+  }
+
   public void setWallpaperEnabled(boolean enabled) {
     if (enabled) {
-      setBackgroundColor(getContext().getResources().getColor(R.color.wallpaper_compose_background));
-      composeContainer.setBackgroundResource(R.drawable.compose_background_wallpaper);
+      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.wallpaper_compose_background)));
+      composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background_wallpaper)));
     } else {
-      setBackgroundColor(getResources().getColor(R.color.signal_background_primary));
-      composeContainer.setBackgroundResource(R.drawable.compose_background);
+      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.signal_background_primary)));
+      composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background)));
     }
   }
 
@@ -422,6 +431,14 @@ public class InputPanel extends LinearLayout
     microphoneRecorderView.unlockAction();
   }
 
+  public void showGifMovedTooltip() {
+    TooltipPopup.forTarget(mediaKeyboard)
+                .setBackgroundTint(ContextCompat.getColor(getContext(), R.color.signal_accent_primary))
+                .setTextColor(getResources().getColor(R.color.core_white))
+                .setText(R.string.ConversationActivity__gifs_are_now_here)
+                .show(TooltipPopup.POSITION_ABOVE);
+  }
+
   public interface Listener {
     void onRecorderStarted();
     void onRecorderLocked();

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

@@ -1,14 +1,19 @@
 package org.thoughtcrime.securesms.components;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.graphics.Insets;
 import android.graphics.Rect;
+import android.os.Build;
 import android.util.AttributeSet;
+import android.view.WindowInsets;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 
+import org.signal.glide.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -26,12 +31,31 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
     super(context, attrs, defStyleAttr);
   }
 
-  public InsetAwareConstraintLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
+  @Override
+  @TargetApi(20)
+  public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+    if (Build.VERSION.SDK_INT < 30) {
+      return super.onApplyWindowInsets(insets);
+    }
+
+    Insets windowInsets = insets.getInsets(WindowInsets.Type.systemBars() | WindowInsets.Type.ime() | WindowInsets.Type.displayCutout());
+    applyInsets(new Rect(windowInsets.left, windowInsets.top, windowInsets.right, windowInsets.bottom));
+
+    return super.onApplyWindowInsets(insets);
   }
 
   @Override
   protected boolean fitSystemWindows(Rect insets) {
+    if (Build.VERSION.SDK_INT >= 30) {
+      return true;
+    }
+
+    applyInsets(insets);
+
+    return true;
+  }
+
+  private void applyInsets(@NonNull Rect insets) {
     Guideline statusBarGuideline     = findViewById(R.id.status_bar_guideline);
     Guideline navigationBarGuideline = findViewById(R.id.navigation_bar_guideline);
     Guideline parentStartGuideline   = findViewById(R.id.parent_start_guideline);
@@ -60,7 +84,5 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
         parentEndGuideline.setGuidelineEnd(insets.left);
       }
     }
-
-    return true;
   }
 }

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

@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2014 Open Whisper Systems
- *
+ * <p>
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * <p>
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -23,8 +23,10 @@ import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.Surface;
 import android.view.View;
+import android.view.WindowInsets;
 
 import androidx.appcompat.widget.LinearLayoutCompat;
 
@@ -45,21 +47,25 @@ import java.util.Set;
 public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   private static final String TAG = Log.tag(KeyboardAwareLinearLayout.class);
 
-  private final Rect                          rect                       = new Rect();
-  private final Set<OnKeyboardHiddenListener> hiddenListeners            = new HashSet<>();
-  private final Set<OnKeyboardShownListener>  shownListeners             = new HashSet<>();
-  private final int                           minKeyboardSize;
-  private final int                           minCustomKeyboardSize;
-  private final int                           defaultCustomKeyboardSize;
-  private final int                           minCustomKeyboardTopMarginPortrait;
-  private final int                           minCustomKeyboardTopMarginLandscape;
-  private final int                           statusBarHeight;
+  private final Rect                          rect            = new Rect();
+  private final Set<OnKeyboardHiddenListener> hiddenListeners = new HashSet<>();
+  private final Set<OnKeyboardShownListener>  shownListeners  = new HashSet<>();
+  private final DisplayMetrics                displayMetrics  = new DisplayMetrics();
+
+  private final int minKeyboardSize;
+  private final int minCustomKeyboardSize;
+  private final int defaultCustomKeyboardSize;
+  private final int minCustomKeyboardTopMarginPortrait;
+  private final int minCustomKeyboardTopMarginLandscape;
+  private final int minCustomKeyboardTopMarginLandscapeBubble;
+  private final int statusBarHeight;
 
   private int viewInset;
 
   private boolean keyboardOpen = false;
   private int     rotation     = -1;
   private boolean isFullscreen = false;
+  private boolean isBubble     = false;
 
   public KeyboardAwareLinearLayout(Context context) {
     this(context, null);
@@ -71,13 +77,14 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
 
   public KeyboardAwareLinearLayout(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
-    minKeyboardSize                     = getResources().getDimensionPixelSize(R.dimen.min_keyboard_size);
-    minCustomKeyboardSize               = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_size);
-    defaultCustomKeyboardSize           = getResources().getDimensionPixelSize(R.dimen.default_custom_keyboard_size);
-    minCustomKeyboardTopMarginPortrait  = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
-    minCustomKeyboardTopMarginLandscape = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
-    statusBarHeight                     = ViewUtil.getStatusBarHeight(this);
-    viewInset                           = getViewInset();
+    minKeyboardSize                           = getResources().getDimensionPixelSize(R.dimen.min_keyboard_size);
+    minCustomKeyboardSize                     = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_size);
+    defaultCustomKeyboardSize                 = getResources().getDimensionPixelSize(R.dimen.default_custom_keyboard_size);
+    minCustomKeyboardTopMarginPortrait        = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
+    minCustomKeyboardTopMarginLandscape       = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
+    minCustomKeyboardTopMarginLandscapeBubble = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_landscape_bubble);
+    statusBarHeight                           = ViewUtil.getStatusBarHeight(this);
+    viewInset                                 = getViewInset();
   }
 
   @Override
@@ -87,6 +94,10 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
   }
 
+  public void setIsBubble(boolean isBubble) {
+    this.isBubble = isBubble;
+  }
+
   private void updateRotation() {
     int oldRotation = rotation;
     rotation = getDeviceRotation();
@@ -120,6 +131,25 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     }
   }
 
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
+      int          bottomInset;
+      WindowInsets windowInsets = getRootWindowInsets();
+      if (Build.VERSION.SDK_INT >= 30) {
+        bottomInset = windowInsets.getInsets(WindowInsets.Type.navigationBars()).bottom;
+      } else {
+        bottomInset = windowInsets.getStableInsetBottom();
+      }
+
+      if (bottomInset != 0 && (viewInset == 0 || viewInset == statusBarHeight)) {
+        Log.i(TAG, "Updating view inset based on WindowInsets. viewInset: " + viewInset + " windowInset: " + bottomInset);
+        viewInset = bottomInset;
+      }
+    }
+  }
+
   @TargetApi(VERSION_CODES.LOLLIPOP)
   private int getViewInset() {
     try {
@@ -129,7 +159,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
       if (attachInfo != null) {
         Field stableInsetsField = attachInfo.getClass().getDeclaredField("mStableInsets");
         stableInsetsField.setAccessible(true);
-        Rect insets = (Rect)stableInsetsField.get(attachInfo);
+        Rect insets = (Rect) stableInsetsField.get(attachInfo);
         if (insets != null) {
           return insets.bottom;
         }
@@ -177,28 +207,51 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     int rotation = getDeviceRotation();
     return rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270;
   }
+
   private int getDeviceRotation() {
-    return ServiceUtil.getWindowManager(getContext()).getDefaultDisplay().getRotation();
+    if (Build.VERSION.SDK_INT >= 30) {
+      getContext().getDisplay().getRealMetrics(displayMetrics);
+    } else {
+      ServiceUtil.getWindowManager(getContext()).getDefaultDisplay().getRealMetrics(displayMetrics);
+    }
+    return displayMetrics.widthPixels > displayMetrics.heightPixels ? Surface.ROTATION_90 : Surface.ROTATION_0;
   }
 
   private int getKeyboardLandscapeHeight() {
+    if (isBubble) {
+      return getRootView().getHeight() - minCustomKeyboardTopMarginLandscapeBubble;
+    }
+
     int keyboardHeight = PreferenceManager.getDefaultSharedPreferences(getContext())
                                           .getInt("keyboard_height_landscape", defaultCustomKeyboardSize);
     return Util.clamp(keyboardHeight, minCustomKeyboardSize, getRootView().getHeight() - minCustomKeyboardTopMarginLandscape);
   }
 
   private int getKeyboardPortraitHeight() {
+    if (isBubble) {
+      int height = getRootView().getHeight();
+      return height - (int)(height * 0.45);
+    }
+
     int keyboardHeight = PreferenceManager.getDefaultSharedPreferences(getContext())
                                           .getInt("keyboard_height_portrait", defaultCustomKeyboardSize);
     return Util.clamp(keyboardHeight, minCustomKeyboardSize, getRootView().getHeight() - minCustomKeyboardTopMarginPortrait);
   }
 
   private void setKeyboardPortraitHeight(int height) {
+    if (isBubble) {
+      return;
+    }
+
     PreferenceManager.getDefaultSharedPreferences(getContext())
                      .edit().putInt("keyboard_height_portrait", height).apply();
   }
 
   private void setKeyboardLandscapeHeight(int height) {
+    if (isBubble) {
+      return;
+    }
+
     PreferenceManager.getDefaultSharedPreferences(getContext())
                      .edit().putInt("keyboard_height_landscape", height).apply();
   }

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

@@ -15,13 +15,17 @@ import android.view.ViewTreeObserver;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public class MaskView extends View {
 
-  private View      target;
-  private ViewGroup activityContentView;
-  private Paint     maskPaint;
-  private Rect      drawingRect = new Rect();
-  private float     targetParentTranslationY;
+  private MaskTarget maskTarget;
+  private ViewGroup  activityContentView;
+  private Paint      maskPaint;
+  private Rect       drawingRect = new Rect();
+  private float      targetParentTranslationY;
 
   private final ViewTreeObserver.OnDrawListener onDrawListener = this::invalidate;
 
@@ -50,15 +54,15 @@ public class MaskView extends View {
     activityContentView = getRootView().findViewById(android.R.id.content);
   }
 
-  public void setTarget(@Nullable View target) {
-    if (this.target != null) {
-      this.target.getViewTreeObserver().removeOnDrawListener(onDrawListener);
+  public void setTarget(@Nullable MaskTarget maskTarget) {
+    if (this.maskTarget != null) {
+      removeOnDrawListener(this.maskTarget, onDrawListener);
     }
 
-    this.target = target;
+    this.maskTarget = maskTarget;
 
-    if (this.target != null) {
-      this.target.getViewTreeObserver().addOnDrawListener(onDrawListener);
+    if (this.maskTarget != null) {
+      addOnDrawListener(maskTarget, onDrawListener);
     }
 
     invalidate();
@@ -72,26 +76,77 @@ public class MaskView extends View {
   protected void onDraw(@NonNull Canvas canvas) {
     super.onDraw(canvas);
 
-    if (target == null || !target.isAttachedToWindow()) {
+    if (nothingToMask(maskTarget)) {
       return;
     }
 
-    target.getDrawingRect(drawingRect);
-    activityContentView.offsetDescendantRectToMyCoords(target, drawingRect);
+    maskTarget.getPrimaryTarget().getDrawingRect(drawingRect);
+    activityContentView.offsetDescendantRectToMyCoords(maskTarget.getPrimaryTarget(), drawingRect);
 
     drawingRect.top    += targetParentTranslationY;
     drawingRect.bottom += targetParentTranslationY;
 
-    Bitmap mask       = Bitmap.createBitmap(target.getWidth(), drawingRect.height(), Bitmap.Config.ARGB_8888);
+    Bitmap mask       = Bitmap.createBitmap(maskTarget.getPrimaryTarget().getWidth(), drawingRect.height(), Bitmap.Config.ARGB_8888);
     Canvas maskCanvas = new Canvas(mask);
 
-    target.draw(maskCanvas);
+    maskTarget.draw(maskCanvas);
 
     canvas.clipRect(drawingRect.left, Math.max(drawingRect.top, getTop() + getPaddingTop()), drawingRect.right, Math.min(drawingRect.bottom, getBottom() - getPaddingBottom()));
 
-    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) target.getLayoutParams();
+    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) maskTarget.getPrimaryTarget().getLayoutParams();
     canvas.drawBitmap(mask, params.leftMargin, drawingRect.top, maskPaint);
 
     mask.recycle();
   }
+
+  private static void removeOnDrawListener(@NonNull MaskTarget maskTarget, @NonNull ViewTreeObserver.OnDrawListener onDrawListener) {
+    for (View view : maskTarget.getAllTargets()) {
+      if (view != null) {
+        view.getViewTreeObserver().removeOnDrawListener(onDrawListener);
+      }
+    }
+  }
+
+  private static void addOnDrawListener(@NonNull MaskTarget maskTarget, @NonNull ViewTreeObserver.OnDrawListener onDrawListener) {
+    for (View view : maskTarget.getAllTargets()) {
+      if (view != null) {
+        view.getViewTreeObserver().addOnDrawListener(onDrawListener);
+      }
+    }
+  }
+
+  private static boolean nothingToMask(@Nullable MaskTarget maskTarget) {
+    if (maskTarget == null) {
+      return true;
+    }
+
+    for (View view : maskTarget.getAllTargets()) {
+      if (view == null || !view.isAttachedToWindow()) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  public static class MaskTarget {
+
+    private final View primaryTarget;
+
+    public MaskTarget(@NonNull View primaryTarget) {
+      this.primaryTarget = primaryTarget;
+    }
+
+    final @NonNull View getPrimaryTarget() {
+      return primaryTarget;
+    }
+
+    protected  @NonNull List<View> getAllTargets() {
+      return Collections.singletonList(primaryTarget);
+    }
+
+    protected void draw(@NonNull Canvas canvas) {
+      primaryTarget.draw(canvas);
+    }
+  }
 }

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

@@ -17,6 +17,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
 
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -25,6 +26,7 @@ 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;
+import org.thoughtcrime.securesms.conversation.colors.ChatColors;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -33,6 +35,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
+import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;
@@ -49,7 +52,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   private ViewGroup footerView;
   private TextView  authorView;
   private TextView  bodyView;
-  private ImageView quoteBarView;
+  private View      quoteBarView;
   private ImageView thumbnailView;
   private View      attachmentVideoOverlayView;
   private ViewGroup attachmentContainerView;
@@ -152,7 +155,8 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
                        @NonNull Recipient author,
                        @Nullable CharSequence body,
                        boolean originalMissing,
-                       @NonNull SlideDeck attachments)
+                       @NonNull SlideDeck attachments,
+                       @Nullable ChatColors chatColors)
   {
     if (this.author != null) this.author.removeForeverObserver(this);
 
@@ -166,6 +170,12 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     setQuoteText(body, attachments);
     setQuoteAttachment(glideRequests, attachments);
     setQuoteMissingFooter(originalMissing);
+
+    if (Build.VERSION.SDK_INT < 21 && messageType == MESSAGE_TYPE_INCOMING && chatColors != null) {
+      this.setBackgroundColor(chatColors.asSingleColor());
+    } else {
+      this.setBackground(null);
+    }
   }
 
   public void setTopCornerSizes(boolean topLeftLarge, boolean topRightLarge) {
@@ -188,15 +198,23 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     setQuoteAuthor(recipient);
   }
 
+  public @NonNull Projection getProjection(@NonNull ViewGroup parent) {
+    return Projection.relativeToParent(parent, this, getCorners());
+  }
+
+  public @NonNull Projection.Corners getCorners() {
+    return new Projection.Corners(cornerMask.getRadii());
+  }
+
   private void setQuoteAuthor(@NonNull Recipient author) {
     boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
+    boolean preview  = messageType == MESSAGE_TYPE_PREVIEW;
 
     authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you)
                                        : author.getDisplayName(getContext()));
 
-    // We use the raw color resource because Android 4.x was struggling with tints here
-    quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing));
-    mainView.setBackgroundColor(author.getColor().toQuoteBackgroundColor(getContext(), outgoing));
+    quoteBarView.setBackgroundColor(ContextCompat.getColor(getContext(), outgoing ? R.color.core_white : android.R.color.transparent));
+    mainView.setBackgroundColor(ContextCompat.getColor(getContext(), preview ? R.color.quote_preview_background : R.color.quote_view_background));
   }
 
   private void setQuoteText(@Nullable CharSequence body, @NonNull SlideDeck attachments) {
@@ -272,7 +290,11 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
 
   private void setQuoteMissingFooter(boolean missing) {
     footerView.setVisibility(missing ? VISIBLE : GONE);
-    footerView.setBackgroundColor(author.get().getColor().toQuoteFooterColor(getContext(), messageType != MESSAGE_TYPE_INCOMING));
+    footerView.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.quote_view_background));
+  }
+
+  public void setTextSize(int unit, float size) {
+    bodyView.setTextSize(unit, size);
   }
 
   public long getQuoteId() {

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

@@ -0,0 +1,137 @@
+package org.thoughtcrime.securesms.components;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Arrays;
+
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+
+/**
+ * Drawable which renders a gradient at a specified angle. Note that this drawable does
+ * not implement drawable state, and all the baggage that comes with a normal Drawable
+ * override, so this may not work in every scenario.
+ *
+ * Essentially, this drawable creates a LinearGradient shader using the given colors and
+ * positions, but makes it larger than the bounds, such that it can be rotated and still
+ * fill the bounds with a gradient.
+ *
+ * If you wish to apply clipping to this drawable, it is recommended to either use it with
+ * a CardView or utilize {@link org.thoughtcrime.securesms.util.CustomDrawWrapperKt#customizeOnDraw(Drawable, Function2)}
+ */
+public final class RotatableGradientDrawable extends Drawable {
+
+  /**
+   * From investigation into how Gradients are rendered vs how they are rendered in
+   * designs, in order to match spec, we need to rotate gradients by 225 degrees. (180 + 45)
+   *
+   * This puts 0 at the bottom (0, -1) of the surface area.
+   */
+  private static final float DEGREE_OFFSET = 225f;
+
+  private final float   degrees;
+  private final int[]   colors;
+  private final float[] positions;
+
+  private final Rect  fillRect  = new Rect();
+  private final Paint fillPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+
+  /**
+   * @param degrees    Gradient rotation in degrees, relative to a vector pointed from the center to bottom center
+   * @param colors     The colors of the gradient
+   * @param positions  The positions of the colors. Values should be between 0f and 1f and this array should be the
+   *                   same length as colors.
+   */
+  public RotatableGradientDrawable(float degrees, int[] colors, @Nullable float[] positions) {
+    this.degrees   = degrees + DEGREE_OFFSET;
+    this.colors    = colors;
+    this.positions = positions;
+  }
+
+  @Override
+  public void setBounds(int left, int top, int right, int bottom) {
+    super.setBounds(left, top, right, bottom);
+
+    Point topLeft     = new Point(left, top);
+    Point topRight    = new Point(right, top);
+    Point bottomLeft  = new Point(left, bottom);
+    Point bottomRight = new Point(right, bottom);
+    Point origin      = new Point(getBounds().width() / 2, getBounds().height() / 2);
+
+    Point rotationTopLeft     = cornerPrime(origin, topLeft, degrees);
+    Point rotationTopRight    = cornerPrime(origin, topRight, degrees);
+    Point rotationBottomLeft  = cornerPrime(origin, bottomLeft, degrees);
+    Point rotationBottomRight = cornerPrime(origin, bottomRight, degrees);
+
+    fillRect.left   = Integer.MAX_VALUE;
+    fillRect.top    = Integer.MAX_VALUE;
+    fillRect.right  = Integer.MIN_VALUE;
+    fillRect.bottom = Integer.MIN_VALUE;
+
+    for (Point point : Arrays.asList(topLeft, topRight, bottomLeft, bottomRight, rotationTopLeft, rotationTopRight, rotationBottomLeft, rotationBottomRight)) {
+      if (point.x < fillRect.left) {
+        fillRect.left = point.x;
+      }
+
+      if (point.x > fillRect.right) {
+        fillRect.right = point.x;
+      }
+
+      if (point.y < fillRect.top) {
+        fillRect.top = point.y;
+      }
+
+      if (point.y > fillRect.bottom) {
+        fillRect.bottom = point.y;
+      }
+    }
+
+    fillPaint.setShader(new LinearGradient(fillRect.left, fillRect.top, fillRect.right, fillRect.bottom, colors, positions, Shader.TileMode.CLAMP));
+  }
+
+  private static Point cornerPrime(@NonNull Point origin, @NonNull Point corner, float degrees) {
+    return new Point(xPrime(origin, corner, Math.toRadians(degrees)), yPrime(origin, corner, Math.toRadians(degrees)));
+  }
+
+  private static int xPrime(@NonNull Point origin, @NonNull Point corner, double theta) {
+    return (int) Math.ceil(((corner.x - origin.x) * Math.cos(theta)) - ((corner.y - origin.y) * Math.sin(theta)) + origin.x);
+  }
+
+  private static int yPrime(@NonNull Point origin, @NonNull Point corner, double theta) {
+    return (int) Math.ceil(((corner.x - origin.x) * Math.sin(theta)) + ((corner.y - origin.y) * Math.cos(theta)) + origin.y);
+  }
+
+  @Override
+  public void draw(Canvas canvas) {
+    int save = canvas.save();
+    canvas.rotate(degrees, getBounds().width() / 2f, getBounds().height() / 2f);
+    canvas.drawRect(fillRect, fillPaint);
+    canvas.restoreToCount(save);
+  }
+
+  @Override
+  public void setAlpha(int alpha) {
+    // Not supported
+  }
+
+  @Override
+  public void setColorFilter(@Nullable ColorFilter colorFilter) {
+    // Not supported
+  }
+
+  @Override
+  public int getOpacity() {
+    return PixelFormat.OPAQUE;
+  }
+}

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

@@ -3,6 +3,12 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.graphics.drawable.shapes.Shape;
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.View;
@@ -12,6 +18,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -25,6 +32,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackPolicy;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -36,8 +44,11 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
+import org.thoughtcrime.securesms.util.views.Stub;
+import org.thoughtcrime.securesms.video.VideoPlayer;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Objects;
@@ -55,11 +66,11 @@ public class ThumbnailView extends FrameLayout {
   private static final int    MIN_HEIGHT = 2;
   private static final int    MAX_HEIGHT = 3;
 
-  private ImageView       image;
-  private ImageView       blurhash;
-  private View            playOverlay;
-  private View            captionIcon;
-  private OnClickListener parentClickListener;
+  private ImageView         image;
+  private ImageView         blurhash;
+  private View              playOverlay;
+  private View              captionIcon;
+  private OnClickListener   parentClickListener;
 
   private final int[] dimens        = new int[2];
   private final int[] bounds        = new int[4];
@@ -90,6 +101,7 @@ public class ThumbnailView extends FrameLayout {
     this.blurhash    = findViewById(R.id.thumbnail_blurhash);
     this.playOverlay = findViewById(R.id.play_overlay);
     this.captionIcon = findViewById(R.id.thumbnail_caption_icon);
+
     super.setOnClickListener(new ThumbnailClickDispatcher());
 
     if (attrs != null) {
@@ -100,9 +112,18 @@ public class ThumbnailView extends FrameLayout {
       bounds[MAX_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxHeight, 0);
       radius             = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.thumbnail_default_radius));
       fit                = typedArray.getInt(R.styleable.ThumbnailView_thumbnail_fit, 0) == 1 ? new FitCenter() : new CenterCrop();
+
+      int transparentOverlayColor = typedArray.getColor(R.styleable.ThumbnailView_transparent_overlay_color, -1);
+      if (transparentOverlayColor > 0) {
+        image.setColorFilter(new PorterDuffColorFilter(transparentOverlayColor, PorterDuff.Mode.SRC_ATOP));
+      } else {
+        image.setColorFilter(null);
+      }
+
       typedArray.recycle();
     } else {
       radius = getResources().getDimensionPixelSize(R.dimen.message_corner_collapse_radius);
+      image.setColorFilter(null);
     }
   }
 
@@ -335,6 +356,7 @@ public class ThumbnailView extends FrameLayout {
       }
 
       buildThumbnailGlideRequest(glideRequests, slide).into(new GlideDrawableListeningTarget(image, result));
+
       resultHandled = true;
     } else {
       glideRequests.clear(image);
@@ -442,7 +464,7 @@ public class ThumbnailView extends FrameLayout {
     }
 
     request = request.override(size[WIDTH], size[HEIGHT]);
-    
+
     if (radius > 0) {
       return request.transforms(fitting, new RoundedCorners(radius));
     } else {

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

@@ -41,8 +41,8 @@ public class ZoomingImageView extends FrameLayout {
 
   private static final float ZOOM_LEVEL_MIN = 1.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 LARGE_IMAGES_ZOOM_LEVEL_MID = 2.0f;
+  private static final float LARGE_IMAGES_ZOOM_LEVEL_MAX = 5.0f;
 
   private static final float SMALL_IMAGES_ZOOM_LEVEL_MID = 3.0f;
   private static final float SMALL_IMAGES_ZOOM_LEVEL_MAX = 8.0f;

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

@@ -1,21 +1,30 @@
 package org.thoughtcrime.securesms.components.emoji;
 
+import android.net.Uri;
+
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.util.Util;
+
 import java.util.LinkedList;
 import java.util.List;
 
 public class CompositeEmojiPageModel implements EmojiPageModel {
-  @AttrRes  private final int         iconAttr;
-  @NonNull  private final EmojiPageModel[] models;
+  @AttrRes private final int                  iconAttr;
+  @NonNull private final List<EmojiPageModel> models;
 
-  public CompositeEmojiPageModel(@AttrRes int iconAttr, @NonNull EmojiPageModel... models) {
+  public CompositeEmojiPageModel(@AttrRes int iconAttr, @NonNull List<EmojiPageModel> models) {
     this.iconAttr = iconAttr;
     this.models   = models;
   }
 
+  @Override
+  public String getKey() {
+    return Util.hasItems(models) ? models.get(0).getKey() : "";
+  }
+
   public int getIconAttr() {
     return iconAttr;
   }
@@ -39,12 +48,7 @@ public class CompositeEmojiPageModel implements EmojiPageModel {
   }
 
   @Override
-  public boolean hasSpriteMap() {
-    return false;
-  }
-
-  @Override
-  public @Nullable String getSprite() {
+  public @Nullable Uri getSpriteUri() {
     return null;
   }
 

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

@@ -11,6 +11,10 @@ public class Emoji {
     this.variations = Arrays.asList(variations);
   }
 
+  public Emoji(List<String> variations) {
+    this.variations = variations;
+  }
+
   public String getValue() {
     return variations.get(0);
   }
@@ -18,4 +22,8 @@ public class Emoji {
   public List<String> getVariations() {
     return variations;
   }
+
+  public boolean hasMultipleVariations() {
+    return variations.size() > 1;
+  }
 }

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

@@ -13,6 +13,7 @@ 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.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 
@@ -34,7 +35,7 @@ public class EmojiEditText extends AppCompatEditText {
     boolean forceCustom = a.getBoolean(R.styleable.EmojiTextView_emoji_forceCustom, false);
     a.recycle();
 
-    if (forceCustom || !TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
+    if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) {
       setFilters(appendEmojiFilter(this.getFilters()));
     }
   }

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

@@ -19,7 +19,7 @@ public class EmojiFilter implements InputFilter {
     char[] v = new char[end - start];
     TextUtils.getChars(source, start, end, v, 0);
 
-    Spannable emojified = EmojiProvider.getInstance(view.getContext()).emojify(new String(v), view);
+    Spannable emojified = EmojiProvider.emojify(new String(v), view);
 
     if (source instanceof Spanned && emojified != null) {
       TextUtils.copySpansFrom((Spanned) source, start, end, null, emojified, 0);

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

@@ -5,6 +5,8 @@ import android.util.AttributeSet;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
+import org.thoughtcrime.securesms.R;
+
 public class EmojiImageView extends AppCompatImageView {
   public EmojiImageView(Context context) {
     super(context);
@@ -15,6 +17,10 @@ public class EmojiImageView extends AppCompatImageView {
   }
 
   public void setImageEmoji(CharSequence emoji) {
-    setImageDrawable(EmojiProvider.getInstance(getContext()).getEmojiDrawable(emoji));
+    if (isInEditMode()) {
+      setImageResource(R.drawable.ic_emoji);
+    } else {
+      setImageDrawable(EmojiProvider.getEmojiDrawable(getContext(), emoji));
+    }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiItemDecoration.kt

@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.components.emoji
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.recyclerview.widget.RecyclerView
+import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiModel
+import org.thoughtcrime.securesms.util.InsetItemDecoration
+import org.thoughtcrime.securesms.util.ViewUtil
+
+private val EDGE_LENGTH: Int = ViewUtil.dpToPx(7)
+private val HORIZONTAL_INSET: Int = ViewUtil.dpToPx(11)
+private val VERTICAL_INSET: Int = ViewUtil.dpToPx(8)
+
+/**
+ * Use super class to add insets to the emojis and use the [onDrawOver] to draw the variation
+ * hint if the emoji has more than one variation.
+ */
+class EmojiItemDecoration(private val allowVariations: Boolean, private val variationsDrawable: Drawable) : InsetItemDecoration(SetInset()) {
+
+  override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+    super.onDrawOver(canvas, parent, state)
+
+    val adapter: EmojiPageViewGridAdapter? = parent.adapter as? EmojiPageViewGridAdapter
+    if (allowVariations && adapter != null) {
+      for (i in 0 until parent.childCount) {
+        val child: View = parent.getChildAt(i)
+        val position: Int = parent.getChildAdapterPosition(child)
+        if (position >= 0 && position <= adapter.itemCount) {
+          val model = adapter.currentList[position]
+          if (model is EmojiModel && model.emoji.hasMultipleVariations()) {
+            variationsDrawable.setBounds(child.right, child.bottom - EDGE_LENGTH, child.right + EDGE_LENGTH, child.bottom)
+            variationsDrawable.draw(canvas)
+          }
+        }
+      }
+    }
+  }
+
+  private class SetInset : InsetItemDecoration.SetInset() {
+    override fun setInset(outRect: Rect, view: View, parent: RecyclerView) {
+      val isFirstHeader = view.javaClass == AppCompatTextView::class.java && getPosition(view, parent) == 0
+      outRect.left = HORIZONTAL_INSET
+      outRect.right = HORIZONTAL_INSET
+      outRect.top = if (isFirstHeader) 0 else VERTICAL_INSET
+      outRect.bottom = VERTICAL_INSET
+    }
+  }
+}

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

@@ -13,6 +13,7 @@ import androidx.viewpager.widget.PagerAdapter;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
+import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.ResUtil;
@@ -22,6 +23,8 @@ import java.util.List;
 
 /**
  * A provider to select emoji in the {@link org.thoughtcrime.securesms.components.emoji.MediaKeyboard}.
+ *
+ * TODO [alex] -- Are we still using any of this?
  */
 public class EmojiKeyboardProvider implements MediaKeyboardProvider,
                                               MediaKeyboardProvider.TabIconProvider,
@@ -30,6 +33,7 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider,
 {
   private static final KeyEvent DELETE_KEY_EVENT = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
 
+  // TODO [alex] -- We are using this.
   public static final String RECENT_STORAGE_KEY = "pref_recent_emoji2";
 
   private final Context              context;
@@ -66,7 +70,7 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider,
     }, this);
 
     models.add(recentModel);
-    models.addAll(EmojiPages.DISPLAY_PAGES);
+    models.addAll(EmojiSource.getLatest().getDisplayPages());
 
     currentPosition = recentModel.getEmoji().size() > 0 ? 0 : 1;
   }

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

@@ -1,12 +1,16 @@
 package org.thoughtcrime.securesms.components.emoji;
 
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
 import java.util.List;
 
 public interface EmojiPageModel {
+  String getKey();
   int getIconAttr();
   List<String> getEmoji();
   List<Emoji> getDisplayEmoji();
-  boolean hasSpriteMap();
-  String getSprite();
+  @Nullable Uri getSpriteUri();
   boolean isDynamic();
 }

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

@@ -1,64 +1,165 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.view.LayoutInflater;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.FrameLayout;
 
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
 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.EmojiHeader;
+import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiNoResultsModel;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
+import org.thoughtcrime.securesms.emoji.EmojiCategory;
+import org.thoughtcrime.securesms.util.ContextUtil;
+import org.thoughtcrime.securesms.util.DrawableUtil;
+import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.MappingModelList;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
-public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
-  private static final String TAG = Log.tag(EmojiPageView.class);
+import java.util.Optional;
+
+public class EmojiPageView extends RecyclerView implements VariationSelectorListener {
 
   private EmojiPageModel                   model;
-  private EmojiPageViewGridAdapter         adapter;
-  private RecyclerView                     recyclerView;
-  private GridLayoutManager                layoutManager;
+  private AdapterFactory                   adapterFactory;
+  private LinearLayoutManager              layoutManager;
   private RecyclerView.OnItemTouchListener scrollDisabler;
   private VariationSelectorListener        variationSelectorListener;
   private EmojiVariationSelectorPopup      popup;
 
+  public EmojiPageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public EmojiPageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
   public EmojiPageView(@NonNull Context context,
                        @NonNull EmojiEventListener emojiSelectionListener,
                        @NonNull VariationSelectorListener variationSelectorListener,
                        boolean allowVariations)
   {
     super(context);
-    final View view = LayoutInflater.from(getContext()).inflate(R.layout.emoji_grid_layout, this, true);
+    initialize(emojiSelectionListener, variationSelectorListener, allowVariations);
+  }
 
+  public EmojiPageView(@NonNull Context context,
+                       @NonNull EmojiEventListener emojiSelectionListener,
+                       @NonNull VariationSelectorListener variationSelectorListener,
+                       boolean allowVariations,
+                       @NonNull LinearLayoutManager layoutManager,
+                       @LayoutRes int displayItemLayoutResId)
+  {
+    super(context);
+    initialize(emojiSelectionListener, variationSelectorListener, allowVariations, layoutManager, displayItemLayoutResId);
+  }
+
+  public void initialize(@NonNull EmojiEventListener emojiSelectionListener,
+                         @NonNull VariationSelectorListener variationSelectorListener,
+                         boolean allowVariations)
+  {
+    initialize(emojiSelectionListener, variationSelectorListener, allowVariations, new GridLayoutManager(getContext(), 8), R.layout.emoji_display_item);
+    Drawable drawable = DrawableUtil.tint(ContextUtil.requireDrawable(getContext(), R.drawable.triangle_bottom_right_corner), ContextCompat.getColor(getContext(), R.color.signal_button_secondary_text_disabled));
+    addItemDecoration(new EmojiItemDecoration(allowVariations, drawable));
+  }
+
+  public void initialize(@NonNull EmojiEventListener emojiSelectionListener,
+                         @NonNull VariationSelectorListener variationSelectorListener,
+                         boolean allowVariations,
+                         @NonNull LinearLayoutManager layoutManager,
+                         @LayoutRes int displayItemLayoutResId)
+  {
     this.variationSelectorListener = variationSelectorListener;
 
-    recyclerView   = view.findViewById(R.id.emoji);
-    layoutManager  = new GridLayoutManager(context, 8);
-    scrollDisabler = new ScrollDisabler();
-    popup          = new EmojiVariationSelectorPopup(context, emojiSelectionListener);
-    adapter        = new EmojiPageViewGridAdapter(EmojiProvider.getInstance(context),
-                                                  popup,
-                                                  emojiSelectionListener,
-                                                  this,
-                                                  allowVariations);
+    this.layoutManager  = layoutManager;
+    this.scrollDisabler = new ScrollDisabler();
+    this.popup          = new EmojiVariationSelectorPopup(getContext(), emojiSelectionListener);
+    this.adapterFactory = () -> new EmojiPageViewGridAdapter(popup,
+                                                             emojiSelectionListener,
+                                                             this,
+                                                             allowVariations,
+                                                             displayItemLayoutResId);
 
-    recyclerView.setLayoutManager(layoutManager);
-    recyclerView.setAdapter(adapter);
+    if (this.layoutManager instanceof GridLayoutManager) {
+      GridLayoutManager gridLayout = (GridLayoutManager) this.layoutManager;
+      gridLayout.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+        @Override
+        public int getSpanSize(int position) {
+          if (getAdapter() != null) {
+            Optional<MappingModel<?>> model = getAdapter().getModel(position);
+            if (model.isPresent() && (model.get() instanceof EmojiHeader || model.get() instanceof EmojiNoResultsModel)) {
+              return gridLayout.getSpanCount();
+            }
+          }
+          return 1;
+        }
+      });
+    }
+
+    setLayoutManager(layoutManager);
+  }
+
+  public void presentForEmojiKeyboard() {
+    setPadding(getPaddingLeft(),
+               getPaddingTop(),
+               getPaddingRight(),
+               getPaddingBottom() + ViewUtil.dpToPx(56));
+
+    setClipToPadding(false);
   }
 
   public void onSelected() {
-    if (model.isDynamic() && adapter != null) {
-      adapter.notifyDataSetChanged();
+    if (getAdapter() != null && (model == null || model.isDynamic())) {
+      getAdapter().notifyDataSetChanged();
     }
   }
 
-  public void setModel(EmojiPageModel model) {
+  public void setList(@NonNull MappingModelList list) {
+    this.model = null;
+    EmojiPageViewGridAdapter adapter = adapterFactory.create();
+    setAdapter(adapter);
+    adapter.submitList(list);
+  }
+
+  public void setModel(@Nullable EmojiPageModel model) {
     this.model = model;
-    adapter.setEmoji(model.getDisplayEmoji());
+
+    EmojiPageViewGridAdapter adapter = adapterFactory.create();
+    setAdapter(adapter);
+    adapter.submitList(getMappingModelList());
+  }
+
+  public void bindSearchableAdapter(@Nullable EmojiPageModel model) {
+    this.model = model;
+
+    EmojiPageViewGridAdapter adapter = adapterFactory.create();
+    setAdapter(adapter);
+    adapter.submitList(getMappingModelList());
+  }
+
+  private @NonNull MappingModelList getMappingModelList() {
+    if (model != null) {
+      boolean emoticonPage = EmojiCategory.EMOTICONS.getKey().equals(model.getKey());
+      return model.getDisplayEmoji()
+                  .stream()
+                  .map(e -> emoticonPage ? new EmojiPageViewGridAdapter.EmojiTextModel(model.getKey(), e)
+                                         : new EmojiPageViewGridAdapter.EmojiModel(model.getKey(), e))
+                  .collect(MappingModelList.collect());
+    }
+
+    return new MappingModelList();
   }
 
   @Override
@@ -70,16 +171,20 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
 
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-    int idealWidth = getContext().getResources().getDimensionPixelOffset(R.dimen.emoji_drawer_item_width);
-    layoutManager.setSpanCount(Math.max(w / idealWidth, 1));
+    if (layoutManager instanceof GridLayoutManager) {
+      int idealWidth = getContext().getResources().getDimensionPixelOffset(R.dimen.emoji_drawer_item_width);
+      int spanCount  = Math.max(w / idealWidth, 1);
+
+      ((GridLayoutManager) layoutManager).setSpanCount(spanCount);
+    }
   }
 
   @Override
   public void onVariationSelectorStateChanged(boolean open) {
     if (open) {
-      recyclerView.addOnItemTouchListener(scrollDisabler);
+      addOnItemTouchListener(scrollDisabler);
     } else {
-      post(() -> recyclerView.removeOnItemTouchListener(scrollDisabler));
+      post(() -> removeOnItemTouchListener(scrollDisabler));
     }
 
     if (variationSelectorListener != null) {
@@ -88,7 +193,29 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
   }
 
   public void setRecyclerNestedScrollingEnabled(boolean enabled) {
-    recyclerView.setNestedScrollingEnabled(enabled);
+    setNestedScrollingEnabled(enabled);
+  }
+
+  public void smoothScrollToPositionTop(int position) {
+    int     currentPosition = layoutManager.findFirstCompletelyVisibleItemPosition();
+    boolean shortTrip       = Math.abs(currentPosition - position) < 475;
+
+    if (shortTrip) {
+      RecyclerView.SmoothScroller smoothScroller = new LinearSmoothScroller(getContext()) {
+        @Override
+        protected int getVerticalSnapPreference() {
+          return LinearSmoothScroller.SNAP_TO_START;
+        }
+      };
+      smoothScroller.setTargetPosition(position);
+      layoutManager.startSmoothScroll(smoothScroller);
+    } else {
+      layoutManager.scrollToPositionWithOffset(position, 0);
+    }
+  }
+
+  public @Nullable EmojiPageViewGridAdapter getAdapter() {
+    return (EmojiPageViewGridAdapter) super.getAdapter();
   }
 
   private static class ScrollDisabler implements RecyclerView.OnItemTouchListener {
@@ -103,4 +230,8 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean b) { }
   }
+
+  private interface AdapterFactory {
+    EmojiPageViewGridAdapter create();
+  }
 }

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

@@ -1,98 +1,38 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
+import android.widget.TextView;
 
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
+import org.thoughtcrime.securesms.util.MappingAdapter;
+import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.MappingViewHolder;
 
-import java.util.ArrayList;
-import java.util.List;
+public class EmojiPageViewGridAdapter extends MappingAdapter implements PopupWindow.OnDismissListener {
 
-public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageViewGridAdapter.EmojiViewHolder> implements PopupWindow.OnDismissListener {
+  private final VariationSelectorListener variationSelectorListener;
 
-  private final List<Emoji>                 emojiList;
-  private final EmojiProvider               emojiProvider;
-  private final EmojiVariationSelectorPopup popup;
-  private final VariationSelectorListener   variationSelectorListener;
-  private final EmojiEventListener          emojiEventListener;
-  private final boolean                     allowVariations;
-
-  public EmojiPageViewGridAdapter(@NonNull EmojiProvider emojiProvider,
-                                  @NonNull EmojiVariationSelectorPopup popup,
+  public EmojiPageViewGridAdapter(@NonNull EmojiVariationSelectorPopup popup,
                                   @NonNull EmojiEventListener emojiEventListener,
                                   @NonNull VariationSelectorListener variationSelectorListener,
-                                  boolean allowVariations)
+                                  boolean allowVariations,
+                                  @LayoutRes int displayItemLayoutResId)
   {
-    this.emojiList                 = new ArrayList<>();
-    this.emojiProvider             = emojiProvider;
-    this.popup                     = popup;
-    this.emojiEventListener        = emojiEventListener;
     this.variationSelectorListener = variationSelectorListener;
-    this.allowVariations           = allowVariations;
 
     popup.setOnDismissListener(this);
-  }
 
-  @NonNull
-  @Override
-  public EmojiViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-    return new EmojiViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.emoji_display_item, viewGroup, false));
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull EmojiViewHolder viewHolder, int i) {
-    Emoji emoji = emojiList.get(i);
-
-    Drawable drawable = emojiProvider.getEmojiDrawable(emoji.getValue());
-
-    if (drawable != null) {
-      viewHolder.textView.setVisibility(View.GONE);
-      viewHolder.imageView.setVisibility(View.VISIBLE);
-
-      viewHolder.imageView.setImageDrawable(drawable);
-    } else {
-      viewHolder.textView.setVisibility(View.VISIBLE);
-      viewHolder.imageView.setVisibility(View.GONE);
-
-      viewHolder.textView.setEmoji(emoji.getValue());
-    }
-
-    viewHolder.itemView.setOnClickListener(v -> {
-      emojiEventListener.onEmojiSelected(emoji.getValue());
-    });
-
-    if (allowVariations && emoji.getVariations().size() > 1) {
-      viewHolder.itemView.setOnLongClickListener(v -> {
-        popup.dismiss();
-        popup.setVariations(emoji.getVariations());
-        popup.showAsDropDown(viewHolder.itemView, 0, -(2 * viewHolder.itemView.getHeight()));
-        variationSelectorListener.onVariationSelectorStateChanged(true);
-        return true;
-      });
-      viewHolder.hintCorner.setVisibility(View.VISIBLE);
-    } else {
-      viewHolder.itemView.setOnLongClickListener(null);
-      viewHolder.hintCorner.setVisibility(View.GONE);
-    }
-  }
-
-  @Override
-  public int getItemCount() {
-    return emojiList.size();
-  }
-
-  public void setEmoji(@NonNull List<Emoji> emojiList) {
-    this.emojiList.clear();
-    this.emojiList.addAll(emojiList);
-    notifyDataSetChanged();
+    registerFactory(EmojiHeader.class, new LayoutFactory<>(EmojiHeaderViewHolder::new, R.layout.emoji_grid_header));
+    registerFactory(EmojiModel.class, new LayoutFactory<>(v -> new EmojiViewHolder(v, emojiEventListener, variationSelectorListener, popup, allowVariations), displayItemLayoutResId));
+    registerFactory(EmojiTextModel.class, new LayoutFactory<>(v -> new EmojiTextViewHolder(v, emojiEventListener), R.layout.emoji_text_display_item));
+    registerFactory(EmojiNoResultsModel.class, new LayoutFactory<>(MappingViewHolder.SimpleViewHolder::new, R.layout.emoji_grid_no_results));
   }
 
   @Override
@@ -100,18 +40,204 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
     variationSelectorListener.onVariationSelectorStateChanged(false);
   }
 
-  static class EmojiViewHolder extends RecyclerView.ViewHolder {
+  public static class EmojiHeader implements MappingModel<EmojiHeader>, HasKey {
 
-    private final ImageView      imageView;
-    private final AsciiEmojiView textView;
-    private final ImageView      hintCorner;
+    private final String key;
+    private final int    title;
 
-    public EmojiViewHolder(@NonNull View itemView) {
+    public EmojiHeader(@NonNull String key, int title) {
+      this.key   = key;
+      this.title = title;
+    }
+
+    @Override
+    public @NonNull String getKey() {
+      return key;
+    }
+
+    @Override
+    public boolean areItemsTheSame(@NonNull EmojiHeader newItem) {
+      return title == newItem.title;
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull EmojiHeader newItem) {
+      return areItemsTheSame(newItem);
+    }
+  }
+
+  static class EmojiHeaderViewHolder extends MappingViewHolder<EmojiHeader> {
+
+    private final TextView title;
+
+    public EmojiHeaderViewHolder(@NonNull View itemView) {
       super(itemView);
+      title = findViewById(R.id.emoji_grid_header_title);
+    }
+
+    @Override
+    public void bind(@NonNull EmojiHeader model) {
+      title.setText(model.title);
+    }
+  }
+
+  public static class EmojiModel implements MappingModel<EmojiModel>, HasKey {
+
+    private final String key;
+    private final Emoji  emoji;
+
+    public EmojiModel(@NonNull String key, @NonNull Emoji emoji) {
+      this.key   = key;
+      this.emoji = emoji;
+    }
+
+    @Override
+    public @NonNull String getKey() {
+      return key;
+    }
+
+    public @NonNull Emoji getEmoji() {
+      return emoji;
+    }
+
+    @Override
+    public boolean areItemsTheSame(@NonNull EmojiModel newItem) {
+      return newItem.emoji.getValue().equals(emoji.getValue());
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull EmojiModel newItem) {
+      return areItemsTheSame(newItem);
+    }
+  }
+
+  static class EmojiViewHolder extends MappingViewHolder<EmojiModel> {
+
+    private final EmojiVariationSelectorPopup popup;
+    private final VariationSelectorListener   variationSelectorListener;
+    private final EmojiEventListener          emojiEventListener;
+    private final boolean                     allowVariations;
+
+    private final ImageView imageView;
+    private final ImageView hintCorner;
+
+    public EmojiViewHolder(@NonNull View itemView,
+                           @NonNull EmojiEventListener emojiEventListener,
+                           @NonNull VariationSelectorListener variationSelectorListener,
+                           @NonNull EmojiVariationSelectorPopup popup,
+                           boolean allowVariations)
+    {
+      super(itemView);
+
+      this.popup                     = popup;
+      this.variationSelectorListener = variationSelectorListener;
+      this.emojiEventListener        = emojiEventListener;
+      this.allowVariations           = allowVariations;
+
       this.imageView  = itemView.findViewById(R.id.emoji_image);
-      this.textView   = itemView.findViewById(R.id.emoji_text);
       this.hintCorner = itemView.findViewById(R.id.emoji_variation_hint);
     }
+
+    @Override
+    public void bind(@NonNull EmojiModel model) {
+      final Drawable drawable = EmojiProvider.getEmojiDrawable(imageView.getContext(), model.emoji.getValue());
+
+      if (drawable != null) {
+        imageView.setVisibility(View.VISIBLE);
+        imageView.setImageDrawable(drawable);
+      }
+
+      itemView.setOnClickListener(v -> {
+        emojiEventListener.onEmojiSelected(model.emoji.getValue());
+      });
+
+      if (allowVariations && model.emoji.hasMultipleVariations()) {
+        if (hintCorner != null) {
+          hintCorner.setVisibility(View.VISIBLE);
+        }
+        itemView.setOnLongClickListener(v -> {
+          popup.dismiss();
+          popup.setVariations(model.emoji.getVariations());
+          popup.showAsDropDown(itemView, 0, -(2 * itemView.getHeight()));
+          variationSelectorListener.onVariationSelectorStateChanged(true);
+          return true;
+        });
+      } else {
+        if (hintCorner != null) {
+          hintCorner.setVisibility(View.GONE);
+        }
+        itemView.setOnLongClickListener(null);
+      }
+    }
+  }
+
+  public static class EmojiTextModel implements MappingModel<EmojiTextModel>, HasKey {
+    private final String key;
+    private final Emoji  emoji;
+
+    public EmojiTextModel(@NonNull String key, @NonNull Emoji emoji) {
+      this.key   = key;
+      this.emoji = emoji;
+    }
+
+    @Override
+    public @NonNull String getKey() {
+      return key;
+    }
+
+    public @NonNull Emoji getEmoji() {
+      return emoji;
+    }
+
+    @Override
+    public boolean areItemsTheSame(@NonNull EmojiTextModel newItem) {
+      return newItem.emoji.getValue().equals(emoji.getValue());
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull EmojiTextModel newItem) {
+      return areItemsTheSame(newItem);
+    }
+  }
+
+  static class EmojiTextViewHolder extends MappingViewHolder<EmojiTextModel> {
+
+    private final EmojiEventListener emojiEventListener;
+    private final AsciiEmojiView     textView;
+
+    public EmojiTextViewHolder(@NonNull View itemView,
+                               @NonNull EmojiEventListener emojiEventListener)
+    {
+      super(itemView);
+
+      this.emojiEventListener = emojiEventListener;
+      this.textView           = itemView.findViewById(R.id.emoji_text);
+    }
+
+    @Override
+    public void bind(@NonNull EmojiTextModel model) {
+      textView.setEmoji(model.emoji.getValue());
+
+      itemView.setOnClickListener(v -> {
+        emojiEventListener.onEmojiSelected(model.emoji.getValue());
+      });
+    }
+  }
+
+  public static class EmojiNoResultsModel implements MappingModel<EmojiNoResultsModel> {
+    @Override
+    public boolean areItemsTheSame(@NonNull EmojiNoResultsModel newItem) {
+      return true;
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull EmojiNoResultsModel newItem) {
+      return true;
+    }
+  }
+
+  public interface HasKey {
+    @NonNull String getKey();
   }
 
   public interface VariationSelectorListener {

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -9,8 +8,6 @@ import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.widget.TextView;
@@ -20,81 +17,42 @@ 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;
-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.emoji.EmojiPageCache;
+import org.thoughtcrime.securesms.emoji.EmojiSource;
+import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
-import org.whispersystems.libsignal.util.Pair;
 
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 class EmojiProvider {
 
-  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);
+  private static final    String TAG   = Log.tag(EmojiProvider.class);
+  private static final    Paint  PAINT = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);
 
-  private final EmojiTree emojiTree = new EmojiTree();
-
-  private static final int EMOJI_RAW_HEIGHT = 64;
-  private static final int EMOJI_RAW_WIDTH  = 64;
-  private static final int EMOJI_VERT_PAD   = 0;
-  private static final int EMOJI_PER_ROW    = 16;
-
-  private final float decodeScale;
-  private final float verticalPad;
-
-  public static EmojiProvider getInstance(Context context) {
-    if (instance == null) {
-      synchronized (EmojiProvider.class) {
-        if (instance == null) {
-          instance = new EmojiProvider(context);
-        }
-      }
-    }
-    return instance;
-  }
-
-  private EmojiProvider(Context context) {
-    this.decodeScale = Math.min(1f, context.getResources().getDimension(R.dimen.emoji_drawer_size) / EMOJI_RAW_HEIGHT);
-    this.verticalPad = EMOJI_VERT_PAD * this.decodeScale;
-
-    for (EmojiPageModel page : EmojiPages.DATA_PAGES) {
-      if (page.hasSpriteMap()) {
-        EmojiPageBitmap pageBitmap = new EmojiPageBitmap(context, page, decodeScale);
-
-        List<String> emojis = page.getEmoji();
-        for (int i = 0; i < emojis.size(); i++) {
-          emojiTree.add(emojis.get(i), new EmojiDrawInfo(pageBitmap, i));
-        }
-      }
-    }
-
-    for (Pair<String,String> obsolete : EmojiPages.OBSOLETE) {
-      emojiTree.add(obsolete.first(), emojiTree.getEmoji(obsolete.second(), 0, obsolete.second().length()));
-    }
-  }
-
-  @Nullable EmojiParser.CandidateList getCandidates(@Nullable CharSequence text) {
+  static @Nullable EmojiParser.CandidateList getCandidates(@Nullable CharSequence text) {
     if (text == null) return null;
-    return new EmojiParser(emojiTree).findCandidates(text);
+    return new EmojiParser(EmojiSource.getLatest().getEmojiTree()).findCandidates(text);
   }
 
-  @Nullable Spannable emojify(@Nullable CharSequence text, @NonNull TextView tv) {
-    return emojify(getCandidates(text), text, tv);
+  static  @Nullable Spannable emojify(@Nullable CharSequence text, @NonNull TextView tv) {
+    if (tv.isInEditMode()) {
+      return null;
+    } else {
+      return emojify(getCandidates(text), text, tv);
+    }
   }
 
-  @Nullable Spannable emojify(@Nullable EmojiParser.CandidateList matches,
-                              @Nullable CharSequence text,
-                              @NonNull TextView tv) {
-    if (matches == null || text == null) return null;
-    SpannableStringBuilder      builder = new SpannableStringBuilder(text);
+  static @Nullable Spannable emojify(@Nullable EmojiParser.CandidateList matches,
+                                     @Nullable CharSequence text,
+                                     @NonNull TextView tv)
+  {
+    if (matches == null || text == null || tv.isInEditMode()) return null;
+    SpannableStringBuilder builder = new SpannableStringBuilder(text);
 
     for (EmojiParser.Candidate candidate : matches) {
-      Drawable drawable = getEmojiDrawable(candidate.getDrawInfo());
+      Drawable drawable = getEmojiDrawable(tv.getContext(), candidate.getDrawInfo());
 
       if (drawable != null) {
         builder.setSpan(new EmojiSpan(drawable, tv), candidate.getStartIndex(), candidate.getEndIndex(),
@@ -105,49 +63,69 @@ class EmojiProvider {
     return builder;
   }
 
-  @Nullable Drawable getEmojiDrawable(CharSequence emoji) {
-    EmojiDrawInfo drawInfo = emojiTree.getEmoji(emoji, 0, emoji.length());
-    return getEmojiDrawable(drawInfo);
+  static @Nullable Drawable getEmojiDrawable(@NonNull Context context, @Nullable CharSequence emoji) {
+    EmojiDrawInfo drawInfo = EmojiSource.getLatest().getEmojiTree().getEmoji(emoji, 0, emoji.length());
+    return getEmojiDrawable(context, drawInfo);
   }
 
-  private @Nullable Drawable getEmojiDrawable(@Nullable EmojiDrawInfo drawInfo) {
-    if (drawInfo == null)  {
+  private static @Nullable Drawable getEmojiDrawable(@NonNull Context context, @Nullable EmojiDrawInfo drawInfo) {
+    if (drawInfo == null) {
       return null;
     }
 
-    final EmojiDrawable drawable = new EmojiDrawable(drawInfo, decodeScale);
-    drawInfo.getPage().get().addListener(new FutureTaskListener<Bitmap>() {
-      @Override public void onSuccess(final Bitmap result) {
-        ThreadUtil.runOnMain(() -> drawable.setBitmap(result));
-      }
+    final int           lowMemoryDecodeScale = DeviceProperties.isLowMemoryDevice(context) ? 2 : 1;
+    final EmojiSource   source               = EmojiSource.getLatest();
+    final EmojiDrawable drawable             = new EmojiDrawable(source, drawInfo, lowMemoryDecodeScale);
+
+    EmojiPageCache.INSTANCE
+                  .load(context, drawInfo.getPage(), lowMemoryDecodeScale)
+                  .addListener(new FutureTaskListener<Bitmap>() {
+                    @Override
+                    public void onSuccess(Bitmap result) {
+                      ThreadUtil.runOnMain(() -> drawable.setBitmap(result));
+                    }
+
+                    @Override
+                    public void onFailure(ExecutionException exception) {
+                      Log.d(TAG, "Failed to load emoji bitmap resource", exception);
+                    }
+                  });
 
-      @Override public void onFailure(ExecutionException error) {
-        Log.w(TAG, error);
-      }
-    });
     return drawable;
   }
 
-  class EmojiDrawable extends Drawable {
-    private final EmojiDrawInfo info;
-    private       Bitmap        bmp;
-    private       float         intrinsicWidth;
-    private       float         intrinsicHeight;
+  static final class EmojiDrawable extends Drawable {
+    private final float intrinsicWidth;
+    private final float intrinsicHeight;
+    private final Rect  emojiBounds;
+
+    private Bitmap bmp;
 
     @Override
     public int getIntrinsicWidth() {
-      return (int)intrinsicWidth;
+      return (int) intrinsicWidth;
     }
 
     @Override
     public int getIntrinsicHeight() {
-      return (int)intrinsicHeight;
+      return (int) intrinsicHeight;
     }
 
-    EmojiDrawable(EmojiDrawInfo info, float decodeScale) {
-      this.info            = info;
-      this.intrinsicWidth  = EMOJI_RAW_WIDTH  * decodeScale;
-      this.intrinsicHeight = EMOJI_RAW_HEIGHT * decodeScale;
+    EmojiDrawable(@NonNull EmojiSource source, @NonNull EmojiDrawInfo info, int lowMemoryDecodeScale) {
+      this.intrinsicWidth  = (source.getMetrics().getRawWidth() * source.getDecodeScale()) / lowMemoryDecodeScale;
+      this.intrinsicHeight = (source.getMetrics().getRawHeight() * source.getDecodeScale()) / lowMemoryDecodeScale;
+
+      final int glyphWidth  = (int) (intrinsicWidth);
+      final int glyphHeight = (int) (intrinsicHeight);
+      final int index       = info.getIndex();
+      final int emojiPerRow = source.getMetrics().getPerRow();
+      final int xStart      = (index % emojiPerRow) * glyphWidth;
+      final int yStart      = (index / emojiPerRow) * glyphHeight;
+
+      this.emojiBounds = new Rect(xStart,
+                                  yStart,
+                                  xStart + glyphWidth,
+                                  yStart + glyphHeight);
     }
 
     @Override
@@ -156,22 +134,15 @@ class EmojiProvider {
         return;
       }
 
-      final int row = info.getIndex() / EMOJI_PER_ROW;
-      final int row_index = info.getIndex() % EMOJI_PER_ROW;
-
       canvas.drawBitmap(bmp,
-                        new Rect((int)(row_index * intrinsicWidth),
-                                 (int)(row * intrinsicHeight + row * verticalPad)+1,
-                                 (int)(((row_index + 1) * intrinsicWidth)-1),
-                                 (int)((row + 1) * intrinsicHeight + row * verticalPad)-1),
+                        emojiBounds,
                         getBounds(),
-                        paint);
+                        PAINT);
     }
 
-    @TargetApi(VERSION_CODES.HONEYCOMB_MR1)
     public void setBitmap(Bitmap bitmap) {
       ThreadUtil.assertMainThread();
-      if (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB_MR1 || bmp == null || !bmp.sameAs(bitmap)) {
+      if (bmp == null || !bmp.sameAs(bitmap)) {
         bmp = bitmap;
         invalidateSelf();
       }
@@ -188,5 +159,4 @@ class EmojiProvider {
     @Override
     public void setColorFilter(ColorFilter cf) { }
   }
-
 }

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

@@ -20,11 +20,10 @@ import androidx.core.content.ContextCompat;
 import androidx.core.widget.TextViewCompat;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
 import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
 
@@ -91,9 +90,9 @@ public class EmojiTextView extends AppCompatTextView {
     super.onDraw(canvas);
   }
 
-  @Override public void setText(@Nullable CharSequence text, BufferType type) {
-    EmojiProvider             provider   = EmojiProvider.getInstance(getContext());
-    EmojiParser.CandidateList candidates = provider.getCandidates(text);
+  @Override
+  public void setText(@Nullable CharSequence text, BufferType type) {
+    EmojiParser.CandidateList candidates = isInEditMode() ? null : EmojiProvider.getCandidates(text);
 
     if (scaleEmojis && candidates != null && candidates.allEmojis) {
       int   emojis = candidates.size();
@@ -119,23 +118,19 @@ public class EmojiTextView extends AppCompatTextView {
     useSystemEmoji       = useSystemEmoji();
 
     if (useSystemEmoji || candidates == null || candidates.size() == 0) {
-      super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")).append(Optional.fromNullable(overflowText).or("")), BufferType.NORMAL);
-
-      if (getEllipsize() == TextUtils.TruncateAt.END && maxLength > 0) {
-        ellipsizeAnyTextForMaxLength();
-      }
+      super.setText(new SpannableStringBuilder(Optional.fromNullable(text).or("")), BufferType.NORMAL);
     } else {
-      CharSequence emojified = provider.emojify(candidates, text, this);
-      super.setText(new SpannableStringBuilder(emojified).append(Optional.fromNullable(overflowText).or("")), BufferType.SPANNABLE);
+      CharSequence emojified = EmojiProvider.emojify(candidates, text, this);
+      super.setText(new SpannableStringBuilder(emojified), BufferType.SPANNABLE);
+    }
 
-      // Android fails to ellipsize spannable strings. (https://issuetracker.google.com/issues/36991688)
-      // We ellipsize them ourselves by manually truncating the appropriate section.
-      if (getEllipsize() == TextUtils.TruncateAt.END) {
-        if (maxLength > 0) {
-          ellipsizeAnyTextForMaxLength();
-        } else {
-          ellipsizeEmojiTextForMaxLines();
-        }
+    // Android fails to ellipsize spannable strings. (https://issuetracker.google.com/issues/36991688)
+    // We ellipsize them ourselves by manually truncating the appropriate section.
+    if (getText() != null && getText().length() > 0 && getEllipsize() == TextUtils.TruncateAt.END) {
+      if (maxLength > 0) {
+        ellipsizeAnyTextForMaxLength();
+      } else if (getMaxLines() > 0) {
+        ellipsizeEmojiTextForMaxLines();
       }
     }
 
@@ -166,12 +161,12 @@ public class EmojiTextView extends AppCompatTextView {
                 .append(ELLIPSIS)
                 .append(Util.emptyIfNull(overflowText));
 
-      EmojiParser.CandidateList newCandidates = EmojiProvider.getInstance(getContext()).getCandidates(newContent);
+      EmojiParser.CandidateList newCandidates = isInEditMode() ? null : EmojiProvider.getCandidates(newContent);
 
       if (useSystemEmoji || newCandidates == null || newCandidates.size() == 0) {
         super.setText(newContent, BufferType.NORMAL);
       } else {
-        CharSequence emojified = EmojiProvider.getInstance(getContext()).emojify(newCandidates, newContent, this);
+        CharSequence emojified = EmojiProvider.emojify(newCandidates, newContent, this);
         super.setText(emojified, BufferType.SPANNABLE);
       }
     }
@@ -193,15 +188,16 @@ public class EmojiTextView extends AppCompatTextView {
       if (lineCount > maxLines) {
         int overflowStart = getLayout().getLineStart(maxLines - 1);
         CharSequence overflow = getText().subSequence(overflowStart, getText().length());
-        CharSequence ellipsized = TextUtils.ellipsize(overflow, getPaint(), getWidth(), TextUtils.TruncateAt.END);
+        float adjust = overflowText != null ? getPaint().measureText(overflowText, 0, overflowText.length()) : 0f;
+        CharSequence ellipsized = TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END);
 
         SpannableStringBuilder newContent = new SpannableStringBuilder();
         newContent.append(getText().subSequence(0, overflowStart))
                   .append(ellipsized.subSequence(0, ellipsized.length()))
                   .append(Optional.fromNullable(overflowText).or(""));
 
-        EmojiParser.CandidateList newCandidates = EmojiProvider.getInstance(getContext()).getCandidates(newContent);
-        CharSequence              emojified     = EmojiProvider.getInstance(getContext()).emojify(newCandidates, newContent, this);
+        EmojiParser.CandidateList newCandidates = isInEditMode() ? null : EmojiProvider.getCandidates(newContent);
+        CharSequence              emojified     = EmojiProvider.emojify(newCandidates, newContent, this);
 
         super.setText(emojified, BufferType.SPANNABLE);
       }
@@ -217,7 +213,7 @@ public class EmojiTextView extends AppCompatTextView {
   }
 
   private boolean useSystemEmoji() {
-   return !forceCustom && TextSecurePreferences.isSystemEmojiPreferred(getContext());
+   return !forceCustom && SignalStore.settings().isPreferSystemEmoji();
   }
 
   @Override
@@ -233,8 +229,8 @@ public class EmojiTextView extends AppCompatTextView {
 
   @Override
   public void invalidateDrawable(@NonNull Drawable drawable) {
-    if (drawable instanceof EmojiDrawable) invalidate();
-    else                                   super.invalidateDrawable(drawable);
+    if (drawable instanceof EmojiProvider.EmojiDrawable) invalidate();
+    else                                                 super.invalidateDrawable(drawable);
   }
 
   @Override

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

@@ -9,13 +9,16 @@ import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyboard.KeyboardPage;
 import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
+import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.MediaKeyboardListener {
 
   private Drawable emojiToggle;
   private Drawable stickerToggle;
+  private Drawable gifToggle;
 
   private Drawable mediaToggle;
   private Drawable imeToggle;
@@ -45,9 +48,10 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
   }
 
   private void initialize() {
-    this.emojiToggle   = ContextCompat.getDrawable(getContext(), R.drawable.ic_emoji_smiley_24);
-    this.stickerToggle = ContextCompat.getDrawable(getContext(), R.drawable.ic_sticker_24);
-    this.imeToggle     = ContextCompat.getDrawable(getContext(), R.drawable.ic_keyboard_24);
+    this.emojiToggle   = ContextUtil.requireDrawable(getContext(), R.drawable.ic_emoji);
+    this.stickerToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_sticker_24);
+    this.gifToggle     = ContextUtil.requireDrawable(getContext(), R.drawable.ic_gif_24);
+    this.imeToggle     = ContextUtil.requireDrawable(getContext(), R.drawable.ic_keyboard_24);
     this.mediaToggle   = emojiToggle;
 
     setToMedia();
@@ -57,8 +61,18 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     drawer.setKeyboardListener(this);
   }
 
-  public void setStickerMode(boolean stickerMode) {
-    this.mediaToggle = stickerMode ? stickerToggle : emojiToggle;
+  public void setStickerMode(@NonNull KeyboardPage page) {
+    switch (page) {
+      case EMOJI:
+        mediaToggle = emojiToggle;
+        break;
+      case STICKER:
+        mediaToggle = stickerToggle;
+        break;
+      case GIF:
+        mediaToggle = gifToggle;
+        break;
+    }
 
     if (getDrawable() != imeToggle) {
       setToMedia();
@@ -78,9 +92,18 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
   }
 
   @Override
-  public void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider) {
-    setStickerMode(provider instanceof StickerKeyboardProvider);
-    TextSecurePreferences.setMediaKeyboardMode(getContext(), (provider instanceof StickerKeyboardProvider) ? TextSecurePreferences.MediaKeyboardMode.STICKER
-                                                                                                           : TextSecurePreferences.MediaKeyboardMode.EMOJI);
+  public void onKeyboardChanged(@NonNull KeyboardPage page) {
+    setStickerMode(page);
+    switch (page) {
+      case EMOJI:
+        TextSecurePreferences.setMediaKeyboardMode(getContext(), TextSecurePreferences.MediaKeyboardMode.EMOJI);
+        break;
+      case STICKER:
+        TextSecurePreferences.setMediaKeyboardMode(getContext(), TextSecurePreferences.MediaKeyboardMode.STICKER);
+        break;
+      case GIF:
+        TextSecurePreferences.setMediaKeyboardMode(getContext(), TextSecurePreferences.MediaKeyboardMode.GIF);
+        break;
+    }
   }
 }

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

@@ -7,50 +7,20 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
+import org.thoughtcrime.securesms.emoji.EmojiSource;
+import org.thoughtcrime.securesms.emoji.ObsoleteEmoji;
 import org.thoughtcrime.securesms.util.StringUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.Pair;
 
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
 public final class EmojiUtil {
-
-  private static final Map<String, String> VARIATION_MAP = new HashMap<>();
-
-  static {
-    for (EmojiPageModel page : EmojiPages.DATA_PAGES) {
-      for (Emoji emoji : page.getDisplayEmoji()) {
-        for (String variation : emoji.getVariations()) {
-          VARIATION_MAP.put(variation, emoji.getValue());
-        }
-      }
-    }
-  }
-
-  public static final int MAX_EMOJI_LENGTH;
-  static {
-    int max = 0;
-    for (EmojiPageModel page : EmojiPages.DATA_PAGES) {
-      for (String emoji : page.getEmoji()) {
-        max = Math.max(max, emoji.length());
-      }
-    }
-    MAX_EMOJI_LENGTH = max;
-  }
-
   private static final Pattern EMOJI_PATTERN = Pattern.compile("^(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+)+$");
 
   private EmojiUtil() {}
 
-  public static List<EmojiPageModel> getDisplayPages() {
-    return EmojiPages.DISPLAY_PAGES;
-  }
-
   /**
    * This will return all ways we know of expressing a singular emoji. This is to aid in search,
    * where some platforms may send an emoji we've locally marked as 'obsolete'.
@@ -60,11 +30,11 @@ public final class EmojiUtil {
 
     out.add(emoji);
 
-    for (Pair<String, String> pair : EmojiPages.OBSOLETE) {
-      if (pair.first().equals(emoji)) {
-        out.add(pair.second());
-      } else if (pair.second().equals(emoji)) {
-        out.add(pair.first());
+    for (ObsoleteEmoji obsoleteEmoji : EmojiSource.getLatest().getObsolete()) {
+      if (obsoleteEmoji.getObsolete().equals(emoji)) {
+        out.add(obsoleteEmoji.getReplaceWith());
+      } else if (obsoleteEmoji.getReplaceWith().equals(emoji)) {
+        out.add(obsoleteEmoji.getObsolete());
       }
     }
 
@@ -79,7 +49,7 @@ public final class EmojiUtil {
    * If the emoji has no skin variations, this function will return the original emoji.
    */
   public static @NonNull String getCanonicalRepresentation(@NonNull String emoji) {
-    String canonical = VARIATION_MAP.get(emoji);
+    String canonical = EmojiSource.getLatest().getVariationsToCanonical().get(emoji);
     return canonical != null ? canonical : emoji;
   }
 
@@ -90,7 +60,7 @@ public final class EmojiUtil {
     if (Util.isEmpty(emoji)) {
       return null;
     } else {
-      return EmojiProvider.getInstance(context).getEmojiDrawable(emoji);
+      return EmojiProvider.getEmojiDrawable(context, emoji);
     }
   }
 
@@ -101,7 +71,7 @@ public final class EmojiUtil {
    * followed by a more wide check for all of the valid emoji unicode ranges (which could lead to
    * some false positives). YMMV.
    */
-  public static boolean isEmoji(@NonNull Context context, @Nullable String text) {
+  public static boolean isEmoji(@Nullable String text) {
     if (Util.isEmpty(text)) {
       return false;
     }
@@ -110,7 +80,7 @@ public final class EmojiUtil {
       return false;
     }
 
-    EmojiParser.CandidateList candidates = EmojiProvider.getInstance(context).getCandidates(text);
+    EmojiParser.CandidateList candidates = EmojiProvider.getCandidates(text);
 
     return (candidates != null && candidates.size() > 0) || EMOJI_PATTERN.matcher(text).matches();
   }

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

@@ -42,7 +42,7 @@ public class EmojiVariationSelectorPopup extends PopupWindow {
 
     for (String variation : variations) {
       ImageView imageView = (ImageView) LayoutInflater.from(context).inflate(R.layout.emoji_variation_selector_item, list, false);
-      imageView.setImageDrawable(EmojiProvider.getInstance(context).getEmojiDrawable(variation));
+      imageView.setImageDrawable(EmojiProvider.getEmojiDrawable(context, variation));
       imageView.setOnClickListener(v -> {
         listener.onEmojiSelected(variation);
         dismiss();

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

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,18 +9,20 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
-import org.thoughtcrime.securesms.components.RepeatableImageKey;
-import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.keyboard.KeyboardPage;
+import org.thoughtcrime.securesms.keyboard.KeyboardPagerFragment;
+import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment;
 
-import java.util.Arrays;
+import java.security.Key;
 
 public class MediaKeyboard extends FrameLayout implements InputView,
                                                           MediaKeyboardProvider.Presenter,
@@ -29,22 +30,15 @@ public class MediaKeyboard extends FrameLayout implements InputView,
                                                           MediaKeyboardBottomTabAdapter.EventListener
 {
 
-  private static final String TAG = Log.tag(MediaKeyboard.class);
+  private static final String TAG          = Log.tag(MediaKeyboard.class);
+  private static final String EMOJI_SEARCH = "emoji_search_fragment";
 
-            private RecyclerView            categoryTabs;
-            private ViewPager               categoryPager;
-            private ViewGroup               providerTabs;
-            private RepeatableImageKey      backspaceButton;
-            private RepeatableImageKey      backspaceButtonBackup;
-            private View                    searchButton;
-            private View                    addButton;
-  @Nullable private MediaKeyboardListener   keyboardListener;
-            private MediaKeyboardProvider[] providers;
-            private int                     providerIndex;
-
-  private final boolean tabsAtBottom;
-
-  private MediaKeyboardBottomTabAdapter categoryTabAdapter;
+  @Nullable private MediaKeyboardListener keyboardListener;
+            private boolean               isInitialised;
+            private int                   latestKeyboardHeight;
+            private State                 keyboardState;
+            private KeyboardPagerFragment keyboardPagerFragment;
+            private FragmentManager       fragmentManager;
 
   public MediaKeyboard(Context context) {
     this(context, null);
@@ -52,23 +46,6 @@ public class MediaKeyboard extends FrameLayout implements InputView,
 
   public MediaKeyboard(Context context, AttributeSet attrs) {
     super(context, attrs);
-
-    TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MediaKeyboard, 0, 0);
-
-    try {
-      tabsAtBottom = typedArray.getInt(R.styleable.MediaKeyboard_tabs_gravity, 0) == 0;
-    } finally {
-      typedArray.recycle();
-    }
-  }
-
-  public void setProviders(int startIndex, MediaKeyboardProvider... providers) {
-    if (!Arrays.equals(this.providers, providers)) {
-      this.providers     = providers;
-      this.providerIndex = startIndex;
-
-      requestPresent(providers, providerIndex);
-    }
   }
 
   public void setKeyboardListener(@Nullable MediaKeyboardListener listener) {
@@ -82,10 +59,12 @@ public class MediaKeyboard extends FrameLayout implements InputView,
 
   @Override
   public void show(int height, boolean immediate) {
-    if (this.categoryPager == null) initView();
+    if (!isInitialised) initView();
+
+    latestKeyboardHeight = height;
 
     ViewGroup.LayoutParams params = getLayoutParams();
-    params.height = height;
+    params.height = (keyboardState == State.NORMAL) ? latestKeyboardHeight : ViewGroup.LayoutParams.WRAP_CONTENT;
     Log.i(TAG, "showing emoji drawer with height " + params.height);
     setLayoutParams(params);
 
@@ -93,19 +72,20 @@ public class MediaKeyboard extends FrameLayout implements InputView,
   }
 
   public void show() {
-    if (this.categoryPager == null) initView();
+    if (!isInitialised) initView();
 
     setVisibility(VISIBLE);
     if (keyboardListener != null) keyboardListener.onShown();
-
-    requestPresent(providers, providerIndex);
+    keyboardPagerFragment.show();
   }
 
   @Override
   public void hide(boolean immediate) {
     setVisibility(GONE);
+    onCloseEmojiSearchInternal(false);
     if (keyboardListener != null) keyboardListener.onHidden();
     Log.i(TAG, "hide()");
+    keyboardPagerFragment.hide();
   }
 
   @Override
@@ -117,30 +97,29 @@ public class MediaKeyboard extends FrameLayout implements InputView,
                       @Nullable MediaKeyboardProvider.SearchObserver searchObserver,
                       int startingIndex)
   {
-    if (categoryPager == null) return;
-    if (!provider.equals(providers[providerIndex])) return;
-    if (keyboardListener != null) keyboardListener.onKeyboardProviderChanged(provider);
-
-    boolean isSolo = providers.length == 1;
-
-    presentProviderStrip(isSolo);
-    presentCategoryPager(pagerAdapter, tabIconProvider, startingIndex);
-    presentProviderTabs(providers, providerIndex);
-    presentSearchButton(searchObserver);
-    presentBackspaceButton(backspaceObserver, isSolo);
-    presentAddButton(addObserver);
+//    if (categoryPager == null) return;
+//    if (!provider.equals(providers[providerIndex])) return;
+//    if (keyboardListener != null) keyboardListener.onKeyboardChanged(provider);
+//
+//    boolean isSolo = providers.length == 1;
+//
+//    presentProviderStrip(isSolo);
+//    presentCategoryPager(pagerAdapter, tabIconProvider, startingIndex);
+//    presentProviderTabs(providers, providerIndex);
+//    presentSearchButton(searchObserver);
+//    presentBackspaceButton(backspaceObserver, isSolo);
+//    presentAddButton(addObserver);
   }
 
   @Override
   public int getCurrentPosition() {
-    return categoryPager != null ? categoryPager.getCurrentItem() : 0;
+//    return categoryPager != null ? categoryPager.getCurrentItem() : 0;
+    return 0;
   }
 
   @Override
   public void requestDismissal() {
     hide(true);
-    providerIndex = 0;
-    if (keyboardListener != null) keyboardListener.onKeyboardProviderChanged(providers[providerIndex]);
   }
 
   @Override
@@ -150,148 +129,82 @@ public class MediaKeyboard extends FrameLayout implements InputView,
 
   @Override
   public void onTabSelected(int index) {
-    if (categoryPager != null) {
-      categoryPager.setCurrentItem(index);
-      categoryTabs.smoothScrollToPosition(index);
-    }
+//    if (categoryPager != null) {
+//      categoryPager.setCurrentItem(index);
+//      categoryTabs.smoothScrollToPosition(index);
+//    }
   }
 
   @Override
   public void setViewPagerEnabled(boolean enabled) {
-    if (categoryPager != null) {
-      categoryPager.setEnabled(enabled);
+//    if (categoryPager != null) {
+//      categoryPager.setEnabled(enabled);
+//    }
+  }
+
+  public void onCloseEmojiSearch() {
+    onCloseEmojiSearchInternal(true);
+  }
+
+  private void onCloseEmojiSearchInternal(boolean showAfterCommit) {
+    if (keyboardState == State.NORMAL) {
+      return;
     }
+
+    keyboardState = State.NORMAL;
+
+    Fragment emojiSearch = fragmentManager.findFragmentByTag(EMOJI_SEARCH);
+    if (emojiSearch == null) {
+      return;
+    }
+
+    FragmentTransaction transaction = fragmentManager.beginTransaction()
+                                                     .remove(emojiSearch)
+                                                     .show(keyboardPagerFragment)
+                                                     .setCustomAnimations(R.anim.fade_in, R.anim.fade_out);
+
+    if (showAfterCommit) {
+      transaction.runOnCommit(() -> show(latestKeyboardHeight, false));
+    }
+
+    transaction.commitAllowingStateLoss();
+  }
+
+  public void onOpenEmojiSearch() {
+    if (keyboardState == State.EMOJI_SEARCH) {
+      return;
+    }
+
+    keyboardState = State.EMOJI_SEARCH;
+
+    fragmentManager.beginTransaction()
+                   .hide(keyboardPagerFragment)
+                   .add(R.id.media_keyboard_fragment_container, new EmojiSearchFragment(), EMOJI_SEARCH)
+                   .runOnCommit(() -> show(latestKeyboardHeight, true))
+                   .setCustomAnimations(R.anim.fade_in, R.anim.fade_out)
+                   .commitAllowingStateLoss();
   }
 
   private void initView() {
-    final View view = LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);
+    if (!isInitialised) {
+      LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);
 
-    RecyclerView categoryTabsTop    = view.findViewById(R.id.media_keyboard_tabs_top);
-    RecyclerView categoryTabsBottom = view.findViewById(R.id.media_keyboard_tabs);
-
-    this.categoryTabs          = tabsAtBottom ? categoryTabsBottom : categoryTabsTop;
-    this.categoryPager         = view.findViewById(R.id.media_keyboard_pager);
-    this.providerTabs          = view.findViewById(R.id.media_keyboard_provider_tabs);
-    this.backspaceButton       = view.findViewById(R.id.media_keyboard_backspace);
-    this.backspaceButtonBackup = view.findViewById(R.id.media_keyboard_backspace_backup);
-    this.searchButton          = view.findViewById(R.id.media_keyboard_search);
-    this.addButton             = view.findViewById(R.id.media_keyboard_add);
-
-    this.categoryTabAdapter = new MediaKeyboardBottomTabAdapter(GlideApp.with(this), this, tabsAtBottom);
-
-    categoryTabs.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-    categoryTabs.setAdapter(categoryTabAdapter);
-    categoryTabs.setVisibility(VISIBLE);
-  }
-
-  private void requestPresent(@NonNull MediaKeyboardProvider[] providers, int newIndex) {
-    providers[providerIndex].setController(null);
-    providerIndex = newIndex;
-
-    providers[providerIndex].setController(this);
-    providers[providerIndex].requestPresentation(this, providers.length == 1);
-  }
-
-
-  private void presentCategoryPager(@NonNull PagerAdapter pagerAdapter,
-                                    @NonNull MediaKeyboardProvider.TabIconProvider iconProvider,
-                                    int startingIndex) {
-    if (categoryPager.getAdapter() != pagerAdapter) {
-      categoryPager.setAdapter(pagerAdapter);
+      keyboardState         = State.NORMAL;
+      latestKeyboardHeight  = -1;
+      isInitialised         = true;
+      fragmentManager       = ((FragmentActivity) getContext()).getSupportFragmentManager();
+      keyboardPagerFragment = (KeyboardPagerFragment) fragmentManager.findFragmentById(R.id.media_keyboard_fragment_container);
     }
-
-    categoryPager.setCurrentItem(startingIndex);
-
-    categoryPager.clearOnPageChangeListeners();
-    categoryPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-      @Override
-      public void onPageScrolled(int i, float v, int i1) {
-      }
-
-      @Override
-      public void onPageSelected(int i) {
-        categoryTabAdapter.setActivePosition(i);
-        categoryTabs.smoothScrollToPosition(i);
-        providers[providerIndex].setCurrentPosition(i);
-      }
-
-      @Override
-      public void onPageScrollStateChanged(int i) {
-      }
-    });
-
-    categoryTabAdapter.setTabIconProvider(iconProvider, pagerAdapter.getCount());
-    categoryTabAdapter.setActivePosition(startingIndex);
-  }
-
-  private void presentProviderTabs(@NonNull MediaKeyboardProvider[] providers, int selected) {
-    providerTabs.removeAllViews();
-
-    LayoutInflater inflater = LayoutInflater.from(getContext());
-
-    for (int i = 0; i < providers.length; i++) {
-      MediaKeyboardProvider provider = providers[i];
-      View                  view     = inflater.inflate(provider.getProviderIconView(i == selected), providerTabs, false);
-
-      view.setTag(provider);
-
-      final int index = i;
-      view.setOnClickListener(v -> {
-        requestPresent(providers, index);
-      });
-
-      providerTabs.addView(view);
-    }
-  }
-
-  private void presentBackspaceButton(@Nullable MediaKeyboardProvider.BackspaceObserver backspaceObserver,
-                                      boolean useBackupPosition)
-  {
-    if (backspaceObserver != null) {
-      if (useBackupPosition) {
-        backspaceButton.setVisibility(INVISIBLE);
-        backspaceButton.setOnKeyEventListener(null);
-        backspaceButtonBackup.setVisibility(VISIBLE);
-        backspaceButtonBackup.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
-      } else {
-        backspaceButton.setVisibility(VISIBLE);
-        backspaceButton.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
-        backspaceButtonBackup.setVisibility(GONE);
-        backspaceButtonBackup.setOnKeyEventListener(null);
-      }
-    } else {
-      backspaceButton.setVisibility(INVISIBLE);
-      backspaceButton.setOnKeyEventListener(null);
-      backspaceButtonBackup.setVisibility(GONE);
-      backspaceButton.setOnKeyEventListener(null);
-    }
-  }
-
-  private void presentAddButton(@Nullable MediaKeyboardProvider.AddObserver addObserver) {
-    if (addObserver != null) {
-      addButton.setVisibility(VISIBLE);
-      addButton.setOnClickListener(v -> addObserver.onAddClicked());
-    } else {
-      addButton.setVisibility(GONE);
-      addButton.setOnClickListener(null);
-    }
-  }
-
-  private void presentSearchButton(@Nullable MediaKeyboardProvider.SearchObserver searchObserver) {
-    searchButton.setVisibility(searchObserver != null ? VISIBLE : INVISIBLE);
-  }
-
-  private void presentProviderStrip(boolean isSolo) {
-    int visibility = isSolo ? View.GONE : View.VISIBLE;
-
-    searchButton.setVisibility(visibility);
-    backspaceButton.setVisibility(visibility);
-    providerTabs.setVisibility(visibility);
   }
 
   public interface MediaKeyboardListener {
     void onShown();
     void onHidden();
-    void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider);
+    void onKeyboardChanged(@NonNull KeyboardPage page);
+  }
+
+  private enum State {
+    NORMAL,
+    EMOJI_SEARCH
   }
 }

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

@@ -16,22 +16,19 @@ public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKey
 
   private final GlideRequests glideRequests;
   private final EventListener eventListener;
-  private final boolean       highlightTop;
 
   private TabIconProvider tabIconProvider;
   private int             activePosition;
   private int             count;
 
-  public MediaKeyboardBottomTabAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener, boolean highlightTop) {
+  public MediaKeyboardBottomTabAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
     this.glideRequests = glideRequests;
     this.eventListener = eventListener;
-    this.highlightTop  = highlightTop;
   }
 
   @Override
   public @NonNull MediaKeyboardBottomTabViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-    return new MediaKeyboardBottomTabViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.media_keyboard_bottom_tab_item, viewGroup, false),
-                                                highlightTop);
+    return new MediaKeyboardBottomTabViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.media_keyboard_bottom_tab_item, viewGroup, false));
   }
 
   @Override
@@ -64,18 +61,12 @@ public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKey
   static class MediaKeyboardBottomTabViewHolder extends RecyclerView.ViewHolder {
 
     private final ImageView image;
-    private final View      indicator;
+    private final View      imageSelected;
 
-    public MediaKeyboardBottomTabViewHolder(@NonNull View itemView, boolean highlightTop) {
+    public MediaKeyboardBottomTabViewHolder(@NonNull View itemView) {
       super(itemView);
-
-      View indicatorTop    = itemView.findViewById(R.id.media_keyboard_top_tab_indicator);
-      View indicatorBottom = itemView.findViewById(R.id.media_keyboard_bottom_tab_indicator);
-
-      this.image     = itemView.findViewById(R.id.media_keyboard_bottom_tab_image);
-      this.indicator = highlightTop ? indicatorTop : indicatorBottom;
-
-      this.indicator.setVisibility(View.VISIBLE);
+      this.image         = itemView.findViewById(R.id.category_icon);
+      this.imageSelected = itemView.findViewById(R.id.category_icon_selected);
     }
 
     void bind(@NonNull GlideRequests glideRequests,
@@ -86,9 +77,7 @@ public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKey
     {
       tabIconProvider.loadCategoryTabIcon(glideRequests, image, index);
       image.setAlpha(selected ? 1 : 0.5f);
-      image.setSelected(selected);
-
-      indicator.setVisibility(selected ? View.VISIBLE : View.INVISIBLE);
+      imageSelected.setSelected(selected);
 
       itemView.setOnClickListener(v -> eventListener.onTabSelected(index));
     }
@@ -98,7 +87,7 @@ public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKey
     }
   }
 
-  interface EventListener {
+  public interface EventListener {
     void onTabSelected(int index);
   }
 }

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

@@ -2,10 +2,12 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.preference.PreferenceManager;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 import com.fasterxml.jackson.databind.type.CollectionType;
@@ -26,11 +28,16 @@ import java.util.List;
 public class RecentEmojiPageModel implements EmojiPageModel {
   private static final String TAG            = Log.tag(RecentEmojiPageModel.class);
   private static final int    EMOJI_LRU_SIZE = 50;
+  public static final  String KEY            = "Recents";
 
   private final SharedPreferences     prefs;
   private final String                preferenceName;
   private final LinkedHashSet<String> recentlyUsed;
 
+  public static boolean hasRecents(Context context, @NonNull String preferenceName) {
+    return PreferenceManager.getDefaultSharedPreferences(context).contains(preferenceName);
+  }
+
   public RecentEmojiPageModel(Context context, @NonNull String preferenceName) {
     this.prefs          = PreferenceManager.getDefaultSharedPreferences(context);
     this.preferenceName = preferenceName;
@@ -49,6 +56,11 @@ public class RecentEmojiPageModel implements EmojiPageModel {
     }
   }
 
+  @Override
+  public String getKey() {
+    return KEY;
+  }
+
   @Override public int getIconAttr() {
     return R.attr.emoji_category_recent;
   }
@@ -63,11 +75,7 @@ public class RecentEmojiPageModel implements EmojiPageModel {
     return Stream.of(getEmoji()).map(Emoji::new).toList();
   }
 
-  @Override public boolean hasSpriteMap() {
-    return false;
-  }
-
-  @Override public String getSprite() {
+  @Override public @Nullable Uri getSpriteUri() {
     return null;
   }
 
@@ -98,13 +106,4 @@ public class RecentEmojiPageModel implements EmojiPageModel {
       }
     });
   }
-
-  private String[] toReversePrimitiveArray(@NonNull LinkedHashSet<String> emojiSet) {
-    String[] emojis = new String[emojiSet.size()];
-    int i = emojiSet.size() - 1;
-    for (String emoji : emojiSet) {
-      emojis[i--] = emoji;
-    }
-    return emojis;
-  }
 }

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

@@ -1,38 +1,40 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import androidx.annotation.AttrRes;
+import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.util.ArrayList;
+import org.thoughtcrime.securesms.emoji.EmojiCategory;
+
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class StaticEmojiPageModel implements EmojiPageModel {
-  @AttrRes  private final int         iconAttr;
-  @NonNull  private final List<Emoji> emoji;
-  @Nullable private final String      sprite;
+  private final @NonNull  EmojiCategory category;
+  private final @NonNull  List<Emoji>   emoji;
+  private final @Nullable Uri           sprite;
 
-  public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull String[] strings, @Nullable String sprite) {
-    List<Emoji> emoji = new ArrayList<>(strings.length);
-    for (String s : strings) {
-      emoji.add(new Emoji(s));
-    }
+  public StaticEmojiPageModel(@NonNull EmojiCategory category, @NonNull String[] strings, @Nullable Uri sprite) {
+    this(category, Arrays.stream(strings).map(s -> new Emoji(Collections.singletonList(s))).collect(Collectors.toList()), sprite);
+  }
 
-    this.iconAttr = iconAttr;
-    this.emoji    = emoji;
+  public StaticEmojiPageModel(@NonNull EmojiCategory category, @NonNull List<Emoji> emoji, @Nullable Uri sprite) {
+    this.category = category;
+    this.emoji    = Collections.unmodifiableList(emoji);
     this.sprite   = sprite;
   }
 
-  public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull Emoji[] emoji, @Nullable String sprite) {
-    this.iconAttr     = iconAttr;
-    this.emoji        = Arrays.asList(emoji);
-    this.sprite       = sprite;
+  @Override
+  public String getKey() {
+    return category.getKey();
   }
 
   public int getIconAttr() {
-    return iconAttr;
+    return category.getIcon();
   }
 
   @Override
@@ -50,12 +52,7 @@ public class StaticEmojiPageModel implements EmojiPageModel {
   }
 
   @Override
-  public boolean hasSpriteMap() {
-    return sprite != null;
-  }
-
-  @Override
-  public @Nullable String getSprite() {
+  public @Nullable Uri getSpriteUri() {
     return sprite;
   }
 

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

@@ -3,17 +3,19 @@ package org.thoughtcrime.securesms.components.emoji.parsing;
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.emoji.EmojiPage;
+
 public class EmojiDrawInfo {
 
-  private final EmojiPageBitmap page;
-  private final int             index;
+  private final EmojiPage page;
+  private final int       index;
 
-  public EmojiDrawInfo(final @NonNull EmojiPageBitmap page, final int index) {
+  public EmojiDrawInfo(final @NonNull EmojiPage page, final int index) {
     this.page  = page;
     this.index = index;
   }
 
-  public @NonNull EmojiPageBitmap getPage() {
+  public @NonNull EmojiPage getPage() {
     return page;
   }
 

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

@@ -1,103 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji.parsing;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.graphics.Bitmap;
-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;
-import org.thoughtcrime.securesms.util.Stopwatch;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.SoftReference;
-import java.util.concurrent.Callable;
-
-public class EmojiPageBitmap {
-
-  private static final String TAG = Log.tag(EmojiPageBitmap.class);
-
-  private final Context        context;
-  private final EmojiPageModel model;
-  private final float          decodeScale;
-
-  private SoftReference<Bitmap>        bitmapReference;
-  private ListenableFutureTask<Bitmap> task;
-
-  public EmojiPageBitmap(@NonNull Context context, @NonNull EmojiPageModel model, float decodeScale) {
-    this.context     = context.getApplicationContext();
-    this.model       = model;
-    this.decodeScale = decodeScale;
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  public ListenableFutureTask<Bitmap> get() {
-    ThreadUtil.assertMainThread();
-
-    if (bitmapReference != null && bitmapReference.get() != null) {
-      return new ListenableFutureTask<>(bitmapReference.get());
-    } else if (task != null) {
-      return task;
-    } else {
-      Callable<Bitmap> callable = () -> {
-        try {
-          Log.i(TAG, "loading page " + model.getSprite());
-          return loadPage();
-        } catch (IOException ioe) {
-          Log.w(TAG, ioe);
-        }
-        return null;
-      };
-      task = new ListenableFutureTask<>(callable);
-      SimpleTask.run(() -> {
-                       task.run();
-                       return null;
-                     },
-                     unused -> task = null);
-    }
-    return task;
-  }
-
-  private Bitmap loadPage() throws IOException {
-    if (bitmapReference != null && bitmapReference.get() != null) return bitmapReference.get();
-
-
-    float                 scale        = decodeScale;
-    AssetManager          assetManager = context.getAssets();
-    InputStream           assetStream  = assetManager.open(model.getSprite());
-    BitmapFactory.Options options      = new BitmapFactory.Options();
-
-    if (Util.isLowMemory(context)) {
-      Log.i(TAG, "Low memory detected. Changing sample size.");
-      options.inSampleSize = 2;
-      scale = decodeScale * 2;
-    }
-
-    Stopwatch stopwatch = new Stopwatch(model.getSprite());
-    Bitmap    bitmap    = BitmapFactory.decodeStream(assetStream, null, options);
-    stopwatch.split("decode");
-
-    Bitmap scaledBitmap = Bitmap.createScaledBitmap(bitmap, (int)(bitmap.getWidth() * scale), (int)(bitmap.getHeight() * scale), true);
-    stopwatch.split("scale");
-    stopwatch.stop(TAG);
-
-    bitmapReference = new SoftReference<>(scaledBitmap);
-    Log.i(TAG, "onPageLoaded(" + model.getSprite() + ")  originalByteCount: " + bitmap.getByteCount()
-                                                    + "  scaledByteCount: "   + scaledBitmap.getByteCount()
-                                                    + "  scaledSize: "        + scaledBitmap.getWidth() + "x" + scaledBitmap.getHeight());
-    return scaledBitmap;
-  }
-
-  @Override
-  public @NonNull String toString() {
-    return model.getSprite();
-  }
-}

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

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
+import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
@@ -43,7 +43,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn
     final IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(getContext());
 
     SimpleTask.run(() -> {
-      try(SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+      try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
         for (IdentityRecord identityRecord : untrustedRecords) {
           identityDatabase.setApproval(identityRecord.getRecipientId(), true);
         }

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

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
+import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
@@ -44,7 +44,7 @@ public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogI
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... params) {
-        try(SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+        try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
           for (IdentityRecord identityRecord : untrustedRecords) {
             identityDatabase.setVerified(identityRecord.getRecipientId(),
                                          identityRecord.getIdentityKey(),

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

@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms.components.reminder;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.R;
-
-/**
- * Shows a reminder to upgrade a group to GV2.
- */
-public class GroupsV1MigrationInitiationReminder extends Reminder {
-
-  public GroupsV1MigrationInitiationReminder(@NonNull Context context) {
-    super(null, context.getString(R.string.GroupsV1MigrationInitiationReminder_to_access_new_features_like_mentions));
-    addAction(new Action(context.getString(R.string.GroupsV1MigrationInitiationReminder_upgrade_group), R.id.reminder_action_gv1_initiation_update_group));
-    addAction(new Action(context.getResources().getString(R.string.GroupsV1MigrationInitiationReminder_not_now), R.id.reminder_action_gv1_initiation_not_now));
-  }
-
-  @Override
-  public boolean isDismissable() {
-    return false;
-  }
-}