Bump version to 5.28.10

We can also switch to using the message-specific update route for
receipts too.

.idea/codeStyles/Project.xml

@@ -43,11 +43,13 @@
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
+        <value>
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </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" />
@@ -213,13 +215,5 @@
         </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>

app/build.gradle

@@ -1,12 +1,9 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'androidx.navigation.safeargs'
-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'
 apply plugin: 'kotlin-parcelize'
@@ -24,12 +21,6 @@ repositories {
             includeGroupByRegex "org\\.signal.*"
         }
     }
-    maven { // textdrawable
-        url 'https://dl.bintray.com/amulyakhare/maven'
-        content {
-            includeGroupByRegex "com\\.amulyakhare.*"
-        }
-    }
     maven {
         url "https://www.jitpack.io"
     }
@@ -46,7 +37,6 @@ repositories {
             includeVersion "cn.carbswang.android", "NumberPickerView", "1.0.9"
             includeVersion "com.takisoft.fix", "colorpicker", "0.9.1"
             includeVersion "com.codewaves.stickyheadergrid", "stickyheadergrid", "0.9.4"
-            includeVersion "com.amulyakhare", "com.amulyakhare.textdrawable", "1.0.1"
             includeVersion "com.google.android", "flexbox", "0.3.0"
         }
     }
@@ -54,7 +44,7 @@ repositories {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.11.4'
+        artifact = 'com.google.protobuf:protoc:3.18.0'
     }
     generateProtoTasks {
         all().each { task ->
@@ -67,8 +57,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 953
-def canonicalVersionName = "5.26.6"
+def canonicalVersionCode = 983
+def canonicalVersionName = "5.28.10"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -80,16 +70,9 @@ def abiPostFix = ['universal'   : 0,
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
 def selectableVariants = [
-        'internalProdFlipper',
-        'internalProdPerf',
-        'internalProdRelease',
-        'internalStagingFlipper',
-        'internalStagingPerf',
-        'internalStagingRelease',
         'nightlyProdFlipper',
         'nightlyProdPerf',
         'nightlyProdRelease',
-        'nightlyStagingPerf',
         'playProdDebug',
         'playProdFlipper',
         'playProdPerf',
@@ -145,7 +128,7 @@ android {
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
-        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
+        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
         buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
@@ -160,14 +143,14 @@ android {
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
         buildConfigField "String", "CDSH_PUBLIC_KEY", "\"2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74\""
-        buildConfigField "String", "CDSH_CODE_HASH", "\"ec31a51880d19a5e9e0fed404740c1a3ff53a553125564b745acce475f0fded8\""
+        buildConfigField "String", "CDSH_CODE_HASH", "\"ec58c0d7561de8d5657f3a4b22a635eaa305204e9359dcc80a99dfd0c5f1cbf2\""
         buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
         buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"," +
                                                                                                 "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
                                                                                                 "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")";
         buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
-        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ==\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
@@ -204,6 +187,16 @@ android {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
 
+    sourceSets {
+        test {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+
+        androidTest {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+    }
+
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JAVA_VERSION
@@ -299,14 +292,6 @@ android {
             buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
         }
 
-        internal {
-            dimension 'distribution'
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"internal\""
-        }
-
         nightly {
             dimension 'distribution'
             versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
@@ -340,7 +325,7 @@ android {
 
             applicationIdSuffix ".staging"
 
-            buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
+            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
@@ -352,7 +337,7 @@ android {
                                                                                                     "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
             buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARB\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
             buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
 
@@ -393,6 +378,7 @@ android {
     }
 
     lintOptions {
+        checkReleaseBuilds false
         abortOnError true
         baseline file("lint-baseline.xml")
         disable "LintError"
@@ -460,12 +446,12 @@ dependencies {
     implementation project(':libsignal-service')
     implementation project(':paging')
     implementation project(':core-util')
+    implementation project(':glide-config')
     implementation project(':video')
     implementation project(':device-transfer')
     implementation project(':image-editor')
     implementation project(':donations')
 
-    implementation libs.signal.zkgroup.android
     implementation libs.signal.client.android
     implementation libs.google.protobuf.javalite
 
@@ -487,8 +473,6 @@ dependencies {
     implementation libs.apache.httpclient.android
     implementation libs.photoview
     implementation libs.glide.glide
-    kapt libs.glide.compiler
-    kapt libs.androidx.annotation
     implementation libs.roundedimageview
     implementation libs.materialish.progress
     implementation libs.greenrobot.eventbus
@@ -496,7 +480,6 @@ dependencies {
     implementation libs.floatingactionbutton
     implementation libs.google.zxing.android.integration
     implementation libs.time.duration.picker
-    implementation libs.textdrawable
     implementation libs.google.zxing.core
     implementation (libs.subsampling.scale.image.view) {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -563,14 +546,11 @@ dependencies {
 
     implementation libs.rxjava3.rxandroid
     implementation libs.rxjava3.rxkotlin
+    implementation libs.rxdogtag
 
     androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }
 
-dependencyVerification {
-    configuration = '(play|website)(Prod|Staging)(Debug|Release)RuntimeClasspath'
-}
-
 def getLastCommitTimestamp() {
     if (!(new File('.git').exists())) {
         return System.currentTimeMillis().toString()
@@ -614,7 +594,8 @@ def getCurrentGitTag() {
     def output = stdout.toString().trim()
 
     if (output != null && output.size() > 0) {
-        return output.split('\n')[0];
+        def tags = output.split('\n').toList()
+        return tags.stream().filter(t -> t.contains('nightly')).findFirst().orElse(tags.get(0))
     } else {
         return null
     }

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.database
 
-import android.app.Application
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
@@ -10,6 +8,11 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.keyvalue.AccountValues
+import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
+import org.thoughtcrime.securesms.keyvalue.KeyValueStore
+import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.libsignal.util.guava.Optional
@@ -24,7 +27,7 @@ class RecipientDatabaseTest {
 
   @Before
   fun setup() {
-    recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    recipientDatabase = SignalDatabase.recipients
     ensureDbEmpty()
   }
 
@@ -216,6 +219,29 @@ class RecipientDatabaseTest {
     assertEquals(E164_A, existingRecipient.requireE164())
   }
 
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser_highTrust() {
+    val dataSet = KeyValueDataSet().apply {
+      putString(AccountValues.KEY_E164, E164_A)
+      putString(AccountValues.KEY_ACI, ACI_A.toString())
+    }
+    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
+
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+    assertNotEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_B, retrievedRecipient.requireAci())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingRecipient = Recipient.resolved(existingId)
+    assertEquals(ACI_A, existingRecipient.requireAci())
+    assertEquals(E164_A, existingRecipient.requireE164())
+  }
+
   // ==============================================================
   // If both the ACI and E164 map to an existing user
   // ==============================================================
@@ -304,6 +330,52 @@ class RecipientDatabaseTest {
     assertEquals(E164_A, existingRecipient2.requireE164())
   }
 
+  /**
+   * Another high trust case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
+   * which clients may need to know for UX purposes.
+   */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange_highTrust() {
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+    assertEquals(existingId1, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(E164_A, retrievedRecipient.requireE164())
+
+    assertFalse(recipientDatabase.getByE164(E164_B).isPresent)
+
+    val recipientWithId2 = Recipient.resolved(existingId2)
+    assertEquals(retrievedId, recipientWithId2.id)
+  }
+
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
+    val dataSet = KeyValueDataSet().apply {
+      putString(AccountValues.KEY_E164, E164_A)
+      putString(AccountValues.KEY_ACI, ACI_B.toString())
+    }
+    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
+
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+    assertEquals(existingId2, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val recipientWithId1 = Recipient.resolved(existingId1)
+    assertEquals(ACI_B, recipientWithId1.requireAci())
+    assertEquals(E164_A, recipientWithId1.requireE164())
+  }
+
   // ==============================================================
   // Misc
   // ==============================================================
@@ -347,11 +419,8 @@ class RecipientDatabaseTest {
     recipientDatabase.getAndPossiblyMerge(null, null, true)
   }
 
-  private val context: Application
-    get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
-
   private fun ensureDbEmpty() {
-    DatabaseFactory.getInstance(context).rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
       assertTrue(cursor.moveToFirst())
       assertEquals(0, cursor.getLong(0))
     }
@@ -361,7 +430,7 @@ class RecipientDatabaseTest {
     val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
     val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
 
-    val E164_A = "+12221234567"
-    val E164_B = "+13331234567"
+    const val E164_A = "+12221234567"
+    const val E164_B = "+13331234567"
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt

@@ -3,7 +3,8 @@ package org.thoughtcrime.securesms.database
 import android.app.Application
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import net.zetetic.database.sqlcipher.SQLiteDatabase
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNotNull
@@ -15,10 +16,14 @@ import org.junit.runner.RunWith
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedMember
 import org.signal.zkgroup.groups.GroupMasterKey
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.model.Mention
+import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
@@ -43,18 +48,22 @@ class RecipientDatabaseTest_merges {
   private lateinit var mmsDatabase: MessageDatabase
   private lateinit var sessionDatabase: SessionDatabase
   private lateinit var mentionDatabase: MentionDatabase
+  private lateinit var reactionDatabase: ReactionDatabase
+  private lateinit var notificationProfileDatabase: NotificationProfileDatabase
 
   @Before
   fun setup() {
-    recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
-    identityDatabase = DatabaseFactory.getIdentityDatabase(context)
-    groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context)
-    groupDatabase = DatabaseFactory.getGroupDatabase(context)
-    threadDatabase = DatabaseFactory.getThreadDatabase(context)
-    smsDatabase = DatabaseFactory.getSmsDatabase(context)
-    mmsDatabase = DatabaseFactory.getMmsDatabase(context)
-    sessionDatabase = DatabaseFactory.getSessionDatabase(context)
-    mentionDatabase = DatabaseFactory.getMentionDatabase(context)
+    recipientDatabase = SignalDatabase.recipients
+    identityDatabase = SignalDatabase.identities
+    groupReceiptDatabase = SignalDatabase.groupReceipts
+    groupDatabase = SignalDatabase.groups
+    threadDatabase = SignalDatabase.threads
+    smsDatabase = SignalDatabase.sms
+    mmsDatabase = SignalDatabase.mms
+    sessionDatabase = SignalDatabase.sessions
+    mentionDatabase = SignalDatabase.mentions
+    reactionDatabase = SignalDatabase.reactions
+    notificationProfileDatabase = SignalDatabase.notificationProfiles
 
     ensureDbEmpty()
   }
@@ -65,6 +74,7 @@ class RecipientDatabaseTest_merges {
     // Setup
     val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
     val recipientIdE164: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_B)
 
     val smsId1: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
     val smsId2: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
@@ -91,6 +101,17 @@ class RecipientDatabaseTest_merges {
 
     sessionDatabase.store(SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
 
+    reactionDatabase.addReaction(MessageId(smsId1, false), ReactionRecord("a", recipientIdAci, 1, 1))
+    reactionDatabase.addReaction(MessageId(mmsId1, true), ReactionRecord("b", recipientIdE164, 1, 1))
+
+    val profile1: NotificationProfile = notificationProfile(name = "Test")
+    val profile2: NotificationProfile = notificationProfile(name = "Test2")
+
+    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
+    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
+    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
+    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
+
     // Merge
     val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
@@ -155,13 +176,30 @@ class RecipientDatabaseTest_merges {
 
     // Session validation
     assertNotNull(sessionDatabase.load(SignalProtocolAddress(ACI_A.toString(), 1)))
+
+    // Reaction validation
+    val reactionsSms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(smsId1, false))
+    val reactionsMms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(mmsId1, true))
+
+    assertEquals(1, reactionsSms.size)
+    assertEquals(ReactionRecord("a", recipientIdAci, 1, 1), reactionsSms[0])
+
+    assertEquals(1, reactionsMms.size)
+    assertEquals(ReactionRecord("b", recipientIdAci, 1, 1), reactionsMms[0])
+
+    // Notification Profile validation
+    val updatedProfile1: NotificationProfile = notificationProfileDatabase.getProfile(profile1.id)!!
+    val updatedProfile2: NotificationProfile = notificationProfileDatabase.getProfile(profile2.id)!!
+
+    assertThat("Notification Profile 1 should now only contain ACI $recipientIdAci", updatedProfile1.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci))
+    assertThat("Notification Profile 2 should now contain ACI A ($recipientIdAci) and ACI B ($recipientIdAciB)", updatedProfile2.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
   }
 
   private val context: Application
     get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
 
   private fun ensureDbEmpty() {
-    DatabaseFactory.getInstance(context).rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
       assertTrue(cursor.moveToFirst())
       assertEquals(0, cursor.getLong(0))
     }
@@ -195,8 +233,7 @@ class RecipientDatabaseTest_merges {
   }
 
   private fun getMention(messageId: Long): MentionModel {
-    val db: SQLiteDatabase = DatabaseFactory.getInstance(context).rawDatabase
-    db.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME}").use { cursor ->
+    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor ->
       cursor.moveToFirst()
       return MentionModel(
         recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)),
@@ -205,6 +242,10 @@ class RecipientDatabaseTest_merges {
     }
   }
 
+  private fun notificationProfile(name: String): NotificationProfile {
+    return (notificationProfileDatabase.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
+  }
+
   /** The normal mention model doesn't have a threadId, so we need to do it ourselves for the test */
   data class MentionModel(
     val recipientId: RecipientId,

app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt

@@ -23,23 +23,37 @@ class FlipperApplicationContext : ApplicationContext() {
 
     LeakCanary.config = LeakCanary.config.copy(
       referenceMatchers = AndroidReferenceMatchers.appDefaults +
-        AndroidReferenceMatchers.instanceFieldLeak(
+        AndroidReferenceMatchers.ignoredInstanceField(
           className = "android.service.media.MediaBrowserService\$ServiceBinder",
-          fieldName = "this\$0",
-          description = "Framework bug",
-          patternApplies = { true }
+          fieldName = "this\$0"
         ) +
-        AndroidReferenceMatchers.instanceFieldLeak(
+        AndroidReferenceMatchers.ignoredInstanceField(
           className = "androidx.media.MediaBrowserServiceCompat\$MediaBrowserServiceImplApi26\$MediaBrowserServiceApi26",
-          fieldName = "mBase",
-          description = "Framework bug",
-          patternApplies = { true }
+          fieldName = "mBase"
         ) +
-        AndroidReferenceMatchers.instanceFieldLeak(
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.MediaBrowserCompat",
+          fieldName = "mImpl"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.session.MediaControllerCompat",
+          fieldName = "mToken"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.session.MediaControllerCompat",
+          fieldName = "mImpl"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
           className = "org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackService",
-          fieldName = "mApplication",
-          description = "Framework bug",
-          patternApplies = { true }
+          fieldName = "mApplication"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "org.thoughtcrime.securesms.service.GenericForegroundService\$LocalBinder",
+          fieldName = "this\$0"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "org.thoughtcrime.securesms.contacts.ContactsSyncAdapter",
+          fieldName = "mContext"
         )
     )
   }

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

@@ -16,7 +16,6 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.database.sqlcipher.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;
@@ -43,14 +42,11 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   @Override
   public List<Descriptor> getDatabases() {
     try {
-      Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
-      databaseHelperField.setAccessible(true);
-
-      SignalDatabase mainOpenHelper       = Objects.requireNonNull((SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext())));
-      SignalDatabase keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
-      SignalDatabase megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
-      SignalDatabase jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
-      SignalDatabase metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper mainOpenHelper       = Objects.requireNonNull(SignalDatabase.getInstance());
+      SignalDatabaseOpenHelper keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
+      SignalDatabaseOpenHelper metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
 
       return Arrays.asList(new Descriptor(mainOpenHelper),
                            new Descriptor(keyValueOpenHelper),
@@ -253,9 +249,9 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   }
 
   static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabase sqlCipherOpenHelper;
+    private final SignalDatabaseOpenHelper sqlCipherOpenHelper;
 
-    Descriptor(@NonNull SignalDatabase sqlCipherOpenHelper) {
+    Descriptor(@NonNull SignalDatabaseOpenHelper sqlCipherOpenHelper) {
       this.sqlCipherOpenHelper = sqlCipherOpenHelper;
     }
 

app/src/internal/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/core_red_shade"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -380,7 +380,7 @@
               android:label="@string/AndroidManifest__change_passphrase"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".VerifyIdentityActivity"
+    <activity android:name=".verify.VerifyIdentityActivity"
               android:theme="@style/Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -770,22 +770,6 @@
 
     </provider>
 
-    <provider android:name=".database.DatabaseContentProviders$Conversation"
-              android:authorities="${applicationId}.database.conversation"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$Attachment"
-              android:authorities="${applicationId}.database.attachment"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$Sticker"
-              android:authorities="${applicationId}.database.sticker"
-              android:exported="false" />
-
-    <provider android:name=".database.DatabaseContentProviders$StickerPack"
-              android:authorities="${applicationId}.database.stickerpack"
-              android:exported="false" />
-
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>

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

@@ -35,12 +35,14 @@ import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
+import org.thoughtcrime.securesms.mms.SignalGlideModule;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
+import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.LogDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
-import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
@@ -51,6 +53,7 @@ import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
+import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
@@ -60,9 +63,11 @@ import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.mms.SignalGlideComponents;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
@@ -84,11 +89,17 @@ import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 
+import java.io.IOException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import rxdogtag2.RxDogTag;
 
 /**
  * Will be called once when the TextSecure process is created.
@@ -123,16 +134,18 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     super.onCreate();
 
     AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
-                            .addBlocking("sqlcipher-init", () -> SqlCipherLibraryLoader.load())
+                            .addBlocking("sqlcipher-init", () -> {
+                              SqlCipherLibraryLoader.load();
+                              SignalDatabase.init(this,
+                                                  DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
+                                                  AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
+                            })
                             .addBlocking("logging", () -> {
                               initializeLogging();
                               Log.i(TAG, "onCreate()");
                             })
                             .addBlocking("crash-handling", this::initializeCrashHandling)
-                            .addBlocking("rx-init", () -> {
-                              RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
-                              RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
-                            })
+                            .addBlocking("rx-init", this::initializeRx)
                             .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
                             .addBlocking("notification-channels", () -> NotificationChannels.create(this))
@@ -156,10 +169,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             })
                             .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addBlocking("feature-flags", FeatureFlags::init)
+                            .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
                             .addNonBlocking(this::cleanAvatarStorage)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
-                            .addNonBlocking(this::initializeGcmCheck)
+                            .addNonBlocking(this::initializeFcmCheck)
                             .addNonBlocking(this::initializeSignedPreKeyCheck)
                             .addNonBlocking(this::initializePeriodicTasks)
                             .addNonBlocking(this::initializeCircumvention)
@@ -171,12 +185,13 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
                             .addNonBlocking(EmojiSource::refresh)
                             .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
+                            .addNonBlocking(this::ensureProfileUploaded)
                             .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()))
+                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -198,7 +213,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
       FeatureFlags.refreshIfNecessary();
       ApplicationDependencies.getRecipientCache().warmUp();
       RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
-      GroupV1MigrationJob.enqueueRoutineMigrationsIfNecessary(this);
       executePendingContactSync();
       KeyCachingService.onAppForegrounded(this);
       ApplicationDependencies.getShakeToReport().enable();
@@ -270,6 +284,30 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
   }
 
+  private void initializeRx() {
+    RxDogTag.install();
+    RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
+    RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
+    RxJavaPlugins.setErrorHandler(e -> {
+      boolean wasWrapped = false;
+      while ((e instanceof UndeliverableException || e instanceof AssertionError || e instanceof OnErrorNotImplementedException) && e.getCause() != null) {
+        wasWrapped = true;
+        e = e.getCause();
+      }
+
+      if (wasWrapped && (e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof InterruptedException)) {
+        return;
+      }
+
+      Thread.UncaughtExceptionHandler uncaughtExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
+      if (uncaughtExceptionHandler == null) {
+        uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+      }
+
+      uncaughtExceptionHandler.uncaughtException(Thread.currentThread(), e);
+    });
+  }
+
   private void initializeApplicationMigrations() {
     ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
   }
@@ -284,7 +322,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeFirstEverAppLaunch() {
     if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SQLCipherOpenHelper.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
+      if (!SignalDatabase.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
         Log.i(TAG, "First ever app launch!");
         AppInitialization.onFirstEverAppLaunch(this);
       }
@@ -300,11 +338,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void initializeGcmCheck() {
-    if (TextSecurePreferences.isPushRegistered(this)) {
-      long nextSetTime = TextSecurePreferences.getFcmTokenLastSetTime(this) + TimeUnit.HOURS.toMillis(6);
+  private void initializeFcmCheck() {
+    if (SignalStore.account().isRegistered()) {
+      long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
 
-      if (TextSecurePreferences.getFcmToken(this) == null || nextSetTime <= System.currentTimeMillis()) {
+      if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {
         ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
       }
     }
@@ -350,7 +388,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCircumvention() {
-    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(ApplicationContext.this)) {
+    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()) {
       try {
         ProviderInstaller.installIfNeeded(ApplicationContext.this);
       } catch (Throwable t) {
@@ -359,6 +397,13 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
+  private void ensureProfileUploaded() {
+    if (SignalStore.account().isRegistered() && !SignalStore.registrationValues().hasUploadedProfile() && !Recipient.self().getProfileName().isEmpty()) {
+      Log.w(TAG, "User has a profile, but has not uploaded one. Uploading now.");
+      ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+    }
+  }
+
   private void executePendingContactSync() {
     if (TextSecurePreferences.needsFullContactSync(this)) {
       ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
@@ -389,7 +434,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCleanup() {
-    int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+    int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();
     Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
   }
 

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

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms;
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.conversationlist.model.Conversation;
+import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
@@ -13,8 +15,8 @@ public interface BindableConversationListItem extends Unbindable {
   void bind(@NonNull ThreadRecord thread,
             @NonNull GlideRequests glideRequests, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
-            @NonNull Set<Long> selectedThreads, boolean batchMode);
+            @NonNull ConversationSet selectedConversations);
 
-  void setBatchMode(boolean batchMode);
+  void setSelectedConversations(@NonNull ConversationSet conversations);
   void updateTypingIndicator(@NonNull Set<Long> typingThreads);
 }

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

@@ -11,7 +11,7 @@ import androidx.lifecycle.Lifecycle;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
@@ -65,7 +65,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
         builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
@@ -104,7 +104,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
         builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));

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

@@ -765,8 +765,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
   public interface OnContactSelectedListener {
     /** Provides an opportunity to disallow selecting an item. Call the callback with false to disallow, or true to allow it. */
-    void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback);
-    void onContactDeselected(Optional<RecipientId> recipientId, String number);
+    void onBeforeContactSelected(Optional<RecipientId> recipientId, @Nullable String number, Consumer<Boolean> callback);
+    void onContactDeselected(Optional<RecipientId> recipientId, @Nullable String number);
     void onSelectionChanged();
   }
 

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

@@ -120,7 +120,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
   }
 
   @Override
-  public void onQrDataFound(final String data) {
+  public void onQrDataFound(@NonNull final String data) {
     ThreadUtil.runOnMain(() -> {
       ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
       Uri uri = Uri.parse(data);
@@ -191,7 +191,6 @@ public class DeviceActivity extends PassphraseRequiredActivity
           Optional<byte[]> profileKey        = Optional.of(ProfileKeyUtil.getProfileKey(getContext()));
 
           TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
-          TextSecurePreferences.setIsUnidentifiedDeliveryEnabled(context, false);
           accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, profileKey, verificationCode);
 
           return SUCCESS;

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

@@ -35,6 +35,7 @@ public final class GroupMembersDialog {
                                         .show();
 
     GroupMemberListView memberListView = dialog.findViewById(R.id.list_members);
+    memberListView.initializeAdapter(fragmentActivity);
 
     LiveGroup                                   liveGroup   = new LiveGroup(groupRecipient.requireGroupId());
     LiveData<List<GroupMemberEntry.FullMember>> fullMembers = liveGroup.getFullMembers();

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

@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.components.ContactFilterView.OnFilterChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -255,7 +255,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
         MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null, null);
 
         if (recipient.getContactUri() != null) {
-          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
+          SignalDatabase.recipients().setHasSentInvite(recipient.getId());
         }
       }
 

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

@@ -73,6 +73,7 @@ import org.thoughtcrime.securesms.sharing.ShareActivity;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 import org.thoughtcrime.securesms.util.StorageUtil;
@@ -534,7 +535,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   }
 
   public static boolean isContentTypeSupported(final String contentType) {
-    return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("video/"));
+    return MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType);
   }
 
   @Override
@@ -568,26 +569,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       if (item == 0) {
         viewPagerListener.onPageSelected(0);
       }
-
-      cursor.registerContentObserver(new ContentObserver(new Handler(getMainLooper())) {
-        @Override
-        public void onChange(boolean selfChange) {
-          onMediaChange();
-        }
-      });
     } else {
       mediaNotAvailable();
     }
   }
 
-  private void onMediaChange() {
-    MediaItemAdapter adapter = (MediaItemAdapter) mediaPager.getAdapter();
-
-    if (adapter != null) {
-      adapter.checkMedia(mediaPager.getCurrentItem());
-    }
-  }
-
   @Override
   public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
 
@@ -615,7 +601,10 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
       if (adapter != null) {
         MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
+        if (item != null && item.recipient != null) {
+          item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
+        }
+
         viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
         initializeActionBar();
       }
@@ -628,7 +617,9 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
       if (adapter != null) {
         MediaItem item = adapter.getMediaItemFor(position);
-        if (item.recipient != null) item.recipient.live().removeObservers(MediaPreviewActivity.this);
+        if (item != null && item.recipient != null) {
+          item.recipient.live().removeObservers(MediaPreviewActivity.this);
+        }
 
         adapter.pause(position);
       }
@@ -678,7 +669,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     }
 
     @Override
-    public MediaItem getMediaItemFor(int position) {
+    public @Nullable MediaItem getMediaItemFor(int position) {
       return new MediaItem(null, null, null, uri, mediaType, -1, true);
     }
 
@@ -701,11 +692,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     public boolean hasFragmentFor(int position) {
       return mediaPreviewFragment != null;
     }
-
-    @Override
-    public void checkMedia(int currentItem) {
-
-    }
   }
 
   private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
@@ -789,8 +775,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       super.destroyItem(container, position, object);
     }
 
-    public MediaItem getMediaItemFor(int position) {
-      cursor.moveToPosition(getCursorPosition(position));
+    public @Nullable MediaItem getMediaItemFor(int position) {
+      int cursorPosition = getCursorPosition(position);
+
+      if (cursor.isClosed() || cursorPosition < 0) {
+        Log.w(TAG, "Invalid cursor state! Closed: " + cursor.isClosed() + " Position: " + cursorPosition);
+        return null;
+      }
+
+      cursor.moveToPosition(cursorPosition);
 
       MediaRecord        mediaRecord       = MediaRecord.from(context, cursor);
       DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
@@ -824,14 +817,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       return mediaFragments.containsKey(position);
     }
 
-    @Override
-    public void checkMedia(int position) {
-      MediaPreviewFragment fragment = mediaFragments.get(position);
-      if (fragment != null) {
-        fragment.checkMediaStillAvailable();
-      }
-    }
-
     private int getCursorPosition(int position) {
       if (leftIsRecent) return position;
       else              return cursor.getCount() - 1 - position;
@@ -866,10 +851,9 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   }
 
   interface MediaItemAdapter {
-    MediaItem getMediaItemFor(int position);
+    @Nullable MediaItem getMediaItemFor(int position);
     void pause(int position);
     @Nullable View getPlaybackControls(int position);
     boolean hasFragmentFor(int position);
-    void checkMedia(int currentItem);
   }
 }

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

@@ -26,12 +26,12 @@ import androidx.appcompat.app.AlertDialog;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -67,7 +67,7 @@ public class NewConversationActivity extends ContactSelectionActivity
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
 
-      if (TextSecurePreferences.isPushRegistered(this) && NetworkConstraint.isMet(this)) {
+      if (SignalStore.account().isRegistered() && NetworkConstraint.isMet(this)) {
         Log.i(TAG, "[onContactSelected] Doing contact refresh.");
 
         AlertDialog progress = SimpleProgressDialog.show(this);
@@ -103,7 +103,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void launch(Recipient recipient) {
-    long   existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
+    long   existingThread = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
     Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
                                                .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
                                                .withDataUri(getIntent().getData())

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

@@ -84,7 +84,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   protected void onResume() {
     super.onResume();
 
-    if (networkAccess.isCensored(this)) {
+    if (networkAccess.isCensored()) {
       ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
     }
   }

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

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;
 
@@ -48,7 +48,7 @@ public class SmsSendtoActivity extends Activity {
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
-      long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
+      long      threadId  = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
 
       nextIntent = ConversationIntents.createBuilder(this, recipient.getId(), threadId)
                                       .withDraftText(destination.getBody())

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

@@ -1,774 +0,0 @@
-/*
- * Copyright (C) 2016-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.Manifest;
-import android.animation.TypeEvaluator;
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Vibrator;
-import android.text.Html;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.animation.Animation;
-import android.view.animation.AnticipateInterpolator;
-import android.view.animation.ScaleAnimation;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ScrollView;
-import android.widget.TextSwitcher;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.OneShotPreDrawListener;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.components.ShapeScrim;
-import org.thoughtcrime.securesms.components.camera.CameraView;
-import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
-import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.database.IdentityDatabase;
-import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
-import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.qr.QrCode;
-import org.thoughtcrime.securesms.qr.ScanListener;
-import org.thoughtcrime.securesms.qr.ScanningThread;
-import org.thoughtcrime.securesms.recipients.LiveRecipient;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-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.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.fingerprint.Fingerprint;
-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.nio.charset.Charset;
-import java.util.Locale;
-
-/**
- * Activity for verifying identity keys.
- *
- * @author Moxie Marlinspike
- */
-@SuppressLint("StaticFieldLeak")
-public class VerifyIdentityActivity extends PassphraseRequiredActivity implements ScanListener, View.OnClickListener {
-
-  private static final String TAG = Log.tag(VerifyIdentityActivity.class);
-
-  private static final String RECIPIENT_EXTRA = "recipient_id";
-  private static final String IDENTITY_EXTRA  = "recipient_identity";
-  private static final String VERIFIED_EXTRA  = "verified_state";
-
-  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
-
-  private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
-  private final VerifyScanFragment    scanFragment    = new VerifyScanFragment();
-
-  public static Intent newIntent(@NonNull Context context,
-                                 @NonNull IdentityRecord identityRecord)
-  {
-    return newIntent(context,
-                     identityRecord.getRecipientId(),
-                     identityRecord.getIdentityKey(),
-                     identityRecord.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
-  }
-
-  public static Intent newIntent(@NonNull Context context,
-                                 @NonNull IdentityRecord identityRecord,
-                                 boolean verified)
-  {
-    return newIntent(context,
-                     identityRecord.getRecipientId(),
-                     identityRecord.getIdentityKey(),
-                     verified);
-  }
-
-  public static Intent newIntent(@NonNull Context context,
-                                 @NonNull RecipientId recipientId,
-                                 @NonNull IdentityKey identityKey,
-                                 boolean verified)
-  {
-    Intent intent = new Intent(context, VerifyIdentityActivity.class);
-
-    intent.putExtra(RECIPIENT_EXTRA, recipientId);
-    intent.putExtra(IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey));
-    intent.putExtra(VERIFIED_EXTRA, verified);
-
-    return intent;
-  }
-
-  @Override
-  public void onPreCreate() {
-    dynamicTheme.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle state, boolean ready) {
-    Bundle extras = new Bundle();
-    extras.putParcelable(VerifyDisplayFragment.RECIPIENT_ID, getIntent().getParcelableExtra(RECIPIENT_EXTRA));
-    extras.putParcelable(VerifyDisplayFragment.REMOTE_IDENTITY, getIntent().getParcelableExtra(IDENTITY_EXTRA));
-    extras.putParcelable(VerifyDisplayFragment.LOCAL_IDENTITY, new IdentityKeyParcelable(IdentityKeyUtil.getIdentityKey(this)));
-    extras.putString(VerifyDisplayFragment.LOCAL_NUMBER, TextSecurePreferences.getLocalNumber(this));
-    extras.putBoolean(VerifyDisplayFragment.VERIFIED_STATE, getIntent().getBooleanExtra(VERIFIED_EXTRA, false));
-
-    scanFragment.setScanListener(this);
-    displayFragment.setClickListener(this);
-
-    initFragment(android.R.id.content, displayFragment, Locale.getDefault(), extras);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public void onQrDataFound(final String data) {
-    ThreadUtil.runOnMain(() -> {
-      ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
-
-      getSupportFragmentManager().popBackStack();
-      displayFragment.setScannedFingerprint(data);
-    });
-  }
-
-  @Override
-  public void onClick(View v) {
-    Permissions.with(this)
-               .request(Manifest.permission.CAMERA)
-               .ifNecessary()
-               .withPermanentDenialDialog(getString(R.string.VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied))
-               .onAllGranted(() -> {
-                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-                 transaction.setCustomAnimations(R.anim.slide_from_top, R.anim.slide_to_bottom,
-                                                 R.anim.slide_from_bottom, R.anim.slide_to_top);
-
-                 transaction.replace(android.R.id.content, scanFragment)
-                            .addToBackStack(null)
-                            .commitAllowingStateLoss();
-               })
-               .onAnyDenied(() -> Toast.makeText(this, R.string.VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission, Toast.LENGTH_LONG).show())
-               .execute();
-  }
-
-  @SuppressLint("MissingSuperCall")
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  public static class VerifyDisplayFragment extends Fragment implements ViewTreeObserver.OnScrollChangedListener {
-
-    public static final String RECIPIENT_ID    = "recipient_id";
-    public static final String REMOTE_NUMBER   = "remote_number";
-    public static final String REMOTE_IDENTITY = "remote_identity";
-    public static final String LOCAL_IDENTITY  = "local_identity";
-    public static final String LOCAL_NUMBER    = "local_number";
-    public static final String VERIFIED_STATE  = "verified_state";
-
-    private LiveRecipient recipient;
-    private IdentityKey   localIdentity;
-    private IdentityKey   remoteIdentity;
-    private Fingerprint   fingerprint;
-
-    private Toolbar              toolbar;
-    private ScrollView           scrollView;
-    private View                 container;
-    private View                 numbersContainer;
-    private View                 loading;
-    private View                 qrCodeContainer;
-    private ImageView            qrCode;
-    private ImageView            qrVerified;
-    private TextSwitcher         tapLabel;
-    private TextView             description;
-    private View.OnClickListener clickListener;
-    private Button               verifyButton;
-    private View                 toolbarShadow;
-    private View                 bottomShadow;
-
-    private TextView[] codes                = new TextView[12];
-    private boolean    animateSuccessOnDraw = false;
-    private boolean    animateFailureOnDraw = false;
-    private boolean    currentVerifiedState = false;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
-      this.container        = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_display_fragment);
-      this.toolbar          = container.findViewById(R.id.toolbar);
-      this.scrollView       = container.findViewById(R.id.scroll_view);
-      this.numbersContainer = container.findViewById(R.id.number_table);
-      this.loading          = container.findViewById(R.id.loading);
-      this.qrCodeContainer  = container.findViewById(R.id.qr_code_container);
-      this.qrCode           = container.findViewById(R.id.qr_code);
-      this.verifyButton     = container.findViewById(R.id.verify_button);
-      this.qrVerified       = container.findViewById(R.id.qr_verified);
-      this.description      = container.findViewById(R.id.description);
-      this.tapLabel         = container.findViewById(R.id.tap_label);
-      this.toolbarShadow    = container.findViewById(R.id.toolbar_shadow);
-      this.bottomShadow     = container.findViewById(R.id.verify_identity_bottom_shadow);
-      this.codes[0]         = container.findViewById(R.id.code_first);
-      this.codes[1]         = container.findViewById(R.id.code_second);
-      this.codes[2]         = container.findViewById(R.id.code_third);
-      this.codes[3]         = container.findViewById(R.id.code_fourth);
-      this.codes[4]         = container.findViewById(R.id.code_fifth);
-      this.codes[5]         = container.findViewById(R.id.code_sixth);
-      this.codes[6]         = container.findViewById(R.id.code_seventh);
-      this.codes[7]         = container.findViewById(R.id.code_eighth);
-      this.codes[8]         = container.findViewById(R.id.code_ninth);
-      this.codes[9]         = container.findViewById(R.id.code_tenth);
-      this.codes[10]        = container.findViewById(R.id.code_eleventh);
-      this.codes[11]        = container.findViewById(R.id.code_twelth);
-
-      this.qrCodeContainer.setOnClickListener(clickListener);
-      this.registerForContextMenu(numbersContainer);
-
-      updateVerifyButton(getArguments().getBoolean(VERIFIED_STATE, false), false);
-      this.verifyButton.setOnClickListener((button -> updateVerifyButton(!currentVerifiedState, true)));
-
-      this.scrollView.getViewTreeObserver().addOnScrollChangedListener(this);
-
-      ((AppCompatActivity)requireActivity()).setSupportActionBar(toolbar);
-      ((AppCompatActivity)requireActivity()).setTitle(R.string.AndroidManifest__verify_safety_number);
-
-      return container;
-    }
-
-    @Override public void onDestroyView() {
-      this.scrollView.getViewTreeObserver().removeOnScrollChangedListener(this);
-      super.onDestroyView();
-    }
-
-    @Override
-    public void onCreate(Bundle bundle) {
-      super.onCreate(bundle);
-
-      RecipientId           recipientId              = getArguments().getParcelable(RECIPIENT_ID);
-      IdentityKeyParcelable localIdentityParcelable  = getArguments().getParcelable(LOCAL_IDENTITY);
-      IdentityKeyParcelable remoteIdentityParcelable = getArguments().getParcelable(REMOTE_IDENTITY);
-
-      if (recipientId == null)              throw new AssertionError("RecipientId required");
-      if (localIdentityParcelable == null)  throw new AssertionError("local identity required");
-      if (remoteIdentityParcelable == null) throw new AssertionError("remote identity required");
-
-      this.localIdentity  = localIdentityParcelable.get();
-      this.recipient      = Recipient.live(recipientId);
-      this.remoteIdentity = remoteIdentityParcelable.get();
-
-      int    version;
-      byte[] localId;
-      byte[] remoteId;
-
-      //noinspection WrongThread
-      Recipient resolved = recipient.resolve();
-
-      if (FeatureFlags.verifyV2() && resolved.getAci().isPresent()) {
-        Log.i(TAG, "Using UUID (version 2).");
-        version  = 2;
-        localId  = TextSecurePreferences.getLocalAci(requireContext()).toByteArray();
-        remoteId = resolved.requireAci().toByteArray();
-      } else if (!FeatureFlags.verifyV2() && resolved.getE164().isPresent()) {
-        Log.i(TAG, "Using E164 (version 1).");
-        version  = 1;
-        localId  = TextSecurePreferences.getLocalNumber(requireContext()).getBytes();
-        remoteId = resolved.requireE164().getBytes();
-      } else {
-        Log.w(TAG, String.format(Locale.ENGLISH, "Could not show proper verification! verifyV2: %s, hasUuid: %s, hasE164: %s", FeatureFlags.verifyV2(), resolved.getAci().isPresent(), resolved.getE164().isPresent()));
-        new MaterialAlertDialogBuilder(requireContext())
-            .setMessage(getString(R.string.VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view, resolved.getDisplayName(requireContext())))
-            .setPositiveButton(android.R.string.ok, (dialog, which) -> requireActivity().finish())
-            .setOnDismissListener(dialog -> {
-              requireActivity().finish();
-              dialog.dismiss();
-            })
-            .show();
-        return;
-      }
-
-      this.recipient.observe(this, this::setRecipientText);
-
-      new AsyncTask<Void, Void, Fingerprint>() {
-        @Override
-        protected Fingerprint doInBackground(Void... params) {
-          return new NumericFingerprintGenerator(5200).createFor(version,
-                                                                 localId, localIdentity,
-                                                                 remoteId, remoteIdentity);
-        }
-
-        @Override
-        protected void onPostExecute(Fingerprint fingerprint) {
-          if (getActivity() == null) return;
-          VerifyDisplayFragment.this.fingerprint = fingerprint;
-          setFingerprintViews(fingerprint, true);
-          getActivity().supportInvalidateOptionsMenu();
-        }
-      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-
-      setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-
-      setRecipientText(recipient.get());
-
-      if (fingerprint != null) {
-        setFingerprintViews(fingerprint, false);
-      }
-
-      if (animateSuccessOnDraw) {
-        animateSuccessOnDraw = false;
-        animateVerifiedSuccess();
-      } else if (animateFailureOnDraw) {
-        animateFailureOnDraw = false;
-        animateVerifiedFailure();
-      }
-
-      ThreadUtil.postToMain(this::onScrollChanged);
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view,
-                                    ContextMenuInfo menuInfo)
-    {
-      super.onCreateContextMenu(menu, view, menuInfo);
-
-      if (fingerprint != null) {
-        MenuInflater inflater = getActivity().getMenuInflater();
-        inflater.inflate(R.menu.verify_display_fragment_context_menu, menu);
-      }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-      if (fingerprint == null) return super.onContextItemSelected(item);
-
-      switch (item.getItemId()) {
-        case R.id.menu_copy:    handleCopyToClipboard(fingerprint, codes.length); return true;
-        case R.id.menu_compare: handleCompareWithClipboard(fingerprint);          return true;
-        default:                return super.onContextItemSelected(item);
-      }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-      super.onCreateOptionsMenu(menu, inflater);
-
-      if (fingerprint != null) {
-        inflater.inflate(R.menu.verify_identity, menu);
-      }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-      switch (item.getItemId()) {
-        case R.id.verify_identity__share: handleShare(fingerprint, codes.length);  return true;
-      }
-
-      return false;
-    }
-
-    public void setScannedFingerprint(String scanned) {
-      try {
-        if (fingerprint.getScannableFingerprint().compareTo(scanned.getBytes("ISO-8859-1"))) {
-          this.animateSuccessOnDraw = true;
-        } else {
-          this.animateFailureOnDraw = true;
-        }
-      } catch (FingerprintVersionMismatchException e) {
-        Log.w(TAG, e);
-        if (e.getOurVersion() < e.getTheirVersion()) {
-          Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal, Toast.LENGTH_LONG).show();
-        } else {
-          Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal, Toast.LENGTH_LONG).show();
-        }
-        this.animateFailureOnDraw = true;
-      } 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();
-        this.animateFailureOnDraw = true;
-      }
-    }
-
-    public void setClickListener(View.OnClickListener listener) {
-      this.clickListener = listener;
-    }
-
-    private @NonNull String getFormattedSafetyNumbers(@NonNull Fingerprint fingerprint, int segmentCount) {
-      String[]      segments = getSegments(fingerprint, segmentCount);
-      StringBuilder result   = new StringBuilder();
-
-      for (int i = 0; i < segments.length; i++) {
-        result.append(segments[i]);
-
-        if (i != segments.length - 1) {
-          if (((i+1) % 4) == 0) result.append('\n');
-          else                  result.append(' ');
-        }
-      }
-
-      return result.toString();
-    }
-
-    private void handleCopyToClipboard(Fingerprint fingerprint, int segmentCount) {
-      Util.writeTextToClipboard(getActivity(), getFormattedSafetyNumbers(fingerprint, segmentCount));
-    }
-
-    private void handleCompareWithClipboard(Fingerprint fingerprint) {
-      String clipboardData = Util.readTextFromClipboard(getActivity());
-
-      if (clipboardData == null) {
-        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show();
-        return;
-      }
-
-      String numericClipboardData = clipboardData.replaceAll("\\D", "");
-
-      if (TextUtils.isEmpty(numericClipboardData) || numericClipboardData.length() != 60) {
-        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show();
-        return;
-      }
-
-      if (fingerprint.getDisplayableFingerprint().getDisplayText().equals(numericClipboardData)) {
-        animateVerifiedSuccess();
-      } else {
-        animateVerifiedFailure();
-      }
-    }
-
-    private void handleShare(@NonNull Fingerprint fingerprint, int segmentCount) {
-      String shareString =
-          getString(R.string.VerifyIdentityActivity_our_signal_safety_number) + "\n" +
-              getFormattedSafetyNumbers(fingerprint, segmentCount) + "\n";
-
-      Intent intent = new Intent();
-      intent.setAction(Intent.ACTION_SEND);
-      intent.putExtra(Intent.EXTRA_TEXT, shareString);
-      intent.setType("text/plain");
-
-      try {
-        startActivity(Intent.createChooser(intent, getString(R.string.VerifyIdentityActivity_share_safety_number_via)));
-      } catch (ActivityNotFoundException e) {
-        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_app_to_share_to, Toast.LENGTH_LONG).show();
-      }
-    }
-
-    private void setRecipientText(Recipient recipient) {
-      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
-      description.setMovementMethod(LinkMovementMethod.getInstance());
-    }
-
-    private void setFingerprintViews(Fingerprint fingerprint, boolean animate) {
-      String[] segments = getSegments(fingerprint, codes.length);
-
-      for (int i=0;i<codes.length;i++) {
-        if (animate) setCodeSegment(codes[i], segments[i]);
-        else         codes[i].setText(segments[i]);
-      }
-
-      byte[] qrCodeData   = fingerprint.getScannableFingerprint().getSerialized();
-      String qrCodeString = new String(qrCodeData, Charset.forName("ISO-8859-1"));
-      Bitmap qrCodeBitmap = QrCode.create(qrCodeString);
-
-      qrCode.setImageBitmap(qrCodeBitmap);
-
-      if (animate) {
-        ViewUtil.fadeIn(qrCode, 1000);
-        ViewUtil.fadeIn(tapLabel, 1000);
-        ViewUtil.fadeOut(loading, 300, View.GONE);
-      } else {
-        qrCode.setVisibility(View.VISIBLE);
-        tapLabel.setVisibility(View.VISIBLE);
-        loading.setVisibility(View.GONE);
-      }
-    }
-
-    private void setCodeSegment(final TextView codeView, String segment) {
-      ValueAnimator valueAnimator = new ValueAnimator();
-      valueAnimator.setObjectValues(0, Integer.parseInt(segment));
-
-      valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-        @Override
-        public void onAnimationUpdate(ValueAnimator animation) {
-          int value = (int) animation.getAnimatedValue();
-          codeView.setText(String.format(Locale.getDefault(), "%05d", value));
-        }
-      });
-
-      valueAnimator.setEvaluator(new TypeEvaluator<Integer>() {
-        public Integer evaluate(float fraction, Integer startValue, Integer endValue) {
-          return Math.round(startValue + (endValue - startValue) * fraction);
-        }
-      });
-
-      valueAnimator.setDuration(1000);
-      valueAnimator.start();
-    }
-
-    private String[] getSegments(Fingerprint fingerprint, int segmentCount) {
-      String[] segments = new String[segmentCount];
-      String   digits   = fingerprint.getDisplayableFingerprint().getDisplayText();
-      int      partSize = digits.length() / segmentCount;
-
-      for (int i=0;i<segmentCount;i++) {
-        segments[i] = digits.substring(i * partSize, (i * partSize) + partSize);
-      }
-
-      return segments;
-    }
-
-    private Bitmap createVerifiedBitmap(int width, int height, @DrawableRes int id) {
-      Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-      Canvas canvas = new Canvas(bitmap);
-      Bitmap check  = BitmapFactory.decodeResource(getResources(), id);
-      float  offset = (width - check.getWidth()) / 2;
-
-      canvas.drawBitmap(check, offset, offset, null);
-
-      return bitmap;
-    }
-
-    private void animateVerifiedSuccess() {
-      Bitmap qrBitmap  = ((BitmapDrawable)qrCode.getDrawable()).getBitmap();
-      Bitmap qrSuccess = createVerifiedBitmap(qrBitmap.getWidth(), qrBitmap.getHeight(), R.drawable.ic_check_white_48dp);
-
-      qrVerified.setImageBitmap(qrSuccess);
-      qrVerified.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.MULTIPLY);
-
-      tapLabel.setText(getString(R.string.verify_display_fragment__successful_match));
-
-      animateVerified();
-    }
-
-    private void animateVerifiedFailure() {
-      Bitmap qrBitmap  = ((BitmapDrawable)qrCode.getDrawable()).getBitmap();
-      Bitmap qrSuccess = createVerifiedBitmap(qrBitmap.getWidth(), qrBitmap.getHeight(), R.drawable.ic_close_white_48dp);
-
-      qrVerified.setImageBitmap(qrSuccess);
-      qrVerified.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.MULTIPLY);
-
-      tapLabel.setText(getString(R.string.verify_display_fragment__failed_to_verify_safety_number));
-
-      animateVerified();
-    }
-
-    private void animateVerified() {
-      ScaleAnimation scaleAnimation = new ScaleAnimation(0, 1, 0, 1,
-                                                         ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-                                                         ScaleAnimation.RELATIVE_TO_SELF, 0.5f);
-      scaleAnimation.setInterpolator(new FastOutSlowInInterpolator());
-      scaleAnimation.setDuration(800);
-      scaleAnimation.setAnimationListener(new Animation.AnimationListener() {
-        @Override
-        public void onAnimationStart(Animation animation) {}
-
-        @Override
-        public void onAnimationEnd(Animation animation) {
-          qrVerified.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-              ScaleAnimation scaleAnimation = new ScaleAnimation(1, 0, 1, 0,
-                                                                 ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-                                                                 ScaleAnimation.RELATIVE_TO_SELF, 0.5f);
-
-              scaleAnimation.setInterpolator(new AnticipateInterpolator());
-              scaleAnimation.setDuration(500);
-              ViewUtil.animateOut(qrVerified, scaleAnimation, View.GONE);
-              ViewUtil.fadeIn(qrCode, 800);
-              qrCodeContainer.setEnabled(true);
-              tapLabel.setText(getString(R.string.verify_display_fragment__tap_to_scan));
-            }
-          }, 2000);
-        }
-
-        @Override
-        public void onAnimationRepeat(Animation animation) {}
-      });
-
-      ViewUtil.fadeOut(qrCode, 200, View.INVISIBLE);
-      ViewUtil.animateIn(qrVerified, scaleAnimation);
-      qrCodeContainer.setEnabled(false);
-    }
-
-    private void updateVerifyButton(boolean verified, boolean update) {
-      currentVerifiedState = verified;
-
-      if (verified) {
-        verifyButton.setText(R.string.verify_display_fragment__clear_verification);
-      } else {
-        verifyButton.setText(R.string.verify_display_fragment__mark_as_verified);
-      }
-
-      if (update) {
-        final RecipientId recipientId = recipient.getId();
-
-        SignalExecutors.BOUNDED.execute(() -> {
-          try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
-            if (verified) {
-              Log.i(TAG, "Saving identity: " + recipientId);
-              ApplicationDependencies.getIdentityStore()
-                                     .saveIdentityWithoutSideEffects(recipientId,
-                                                                     remoteIdentity,
-                                                                     VerifiedStatus.VERIFIED,
-                                                                     false,
-                                                                     System.currentTimeMillis(),
-                                                                     true);
-            } else {
-              ApplicationDependencies.getIdentityStore().setVerified(recipientId, remoteIdentity, VerifiedStatus.DEFAULT);
-            }
-
-            ApplicationDependencies.getJobManager()
-                                   .add(new MultiDeviceVerifiedUpdateJob(recipientId,
-                                                                         remoteIdentity,
-                                                                         verified ? VerifiedStatus.VERIFIED
-                                                                                   : VerifiedStatus.DEFAULT));
-            StorageSyncHelper.scheduleSyncForDataChange();
-
-            IdentityUtil.markIdentityVerified(getActivity(), recipient.get(), verified, false);
-          }
-        });
-      }
-    }
-
-
-    @Override public void onScrollChanged() {
-      if (scrollView.canScrollVertically(-1)) {
-        if (toolbarShadow.getVisibility() != View.VISIBLE) {
-          ViewUtil.fadeIn(toolbarShadow, 250);
-        }
-      } else {
-        if (toolbarShadow.getVisibility() != View.GONE) {
-          ViewUtil.fadeOut(toolbarShadow, 250);
-        }
-      }
-
-      if (scrollView.canScrollVertically(1)) {
-        if (bottomShadow.getVisibility() != View.VISIBLE) {
-          ViewUtil.fadeIn(bottomShadow, 250);
-        }
-      } else {
-        ViewUtil.fadeOut(bottomShadow, 250);
-      }
-    }
-  }
-
-  public static class VerifyScanFragment extends Fragment {
-
-    private View           container;
-    private CameraView     cameraView;
-    private ShapeScrim     cameraScrim;
-    private ImageView      cameraMarks;
-    private ScanningThread scanningThread;
-    private ScanListener   scanListener;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
-      this.container   = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_scan_fragment);
-      this.cameraView  = container.findViewById(R.id.scanner);
-      this.cameraScrim = container.findViewById(R.id.camera_scrim);
-      this.cameraMarks = container.findViewById(R.id.camera_marks);
-
-      OneShotPreDrawListener.add(cameraScrim, () -> {
-        int width  = cameraScrim.getScrimWidth();
-        int height = cameraScrim.getScrimHeight();
-
-        ViewUtil.updateLayoutParams(cameraMarks, width, height);
-      });
-
-      return container;
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-      this.scanningThread = new ScanningThread();
-      this.scanningThread.setScanListener(scanListener);
-      this.scanningThread.setCharacterSet("ISO-8859-1");
-      this.cameraView.onResume();
-      this.cameraView.setPreviewCallback(scanningThread);
-      this.scanningThread.start();
-    }
-
-    @Override
-    public void onPause() {
-      super.onPause();
-      this.cameraView.onPause();
-      this.scanningThread.stopScanning();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfiguration) {
-      super.onConfigurationChanged(newConfiguration);
-      this.cameraView.onPause();
-      this.cameraView.onResume();
-      this.cameraView.setPreviewCallback(scanningThread);
-    }
-
-    public void setScanListener(ScanListener listener) {
-      if (this.scanningThread != null) scanningThread.setScanListener(listener);
-      this.scanListener = listener;
-    }
-
-  }
-}

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

@@ -256,7 +256,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private void processIntent(@NonNull Intent intent) {
     if (ANSWER_ACTION.equals(intent.getAction())) {
-      viewModel.setRecipient(EventBus.getDefault().getStickyEvent(WebRtcViewModel.class).getRecipient());
       handleAnswerWithAudio();
     } else if (DENY_ACTION.equals(intent.getAction())) {
       handleDenyCall();
@@ -403,24 +402,19 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void handleAnswerWithAudio() {
-    Recipient recipient = viewModel.getRecipient().get();
+    Permissions.with(this)
+               .request(Manifest.permission.RECORD_AUDIO)
+               .ifNecessary()
+               .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone),
+                                    R.drawable.ic_mic_solid_24)
+               .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
+               .onAllGranted(() -> {
+                 callScreen.setStatus(getString(R.string.RedPhone_answering));
 
-    if (!recipient.equals(Recipient.UNKNOWN)) {
-      Permissions.with(this)
-                 .request(Manifest.permission.RECORD_AUDIO)
-                 .ifNecessary()
-                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
-                                      R.drawable.ic_mic_solid_24)
-                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
-                 .onAllGranted(() -> {
-                   callScreen.setRecipient(recipient);
-                   callScreen.setStatus(getString(R.string.RedPhone_answering));
-
-                   ApplicationDependencies.getSignalCallManager().acceptCall(false);
-                 })
-                 .onAnyDenied(this::handleDenyCall)
-                 .execute();
-    }
+                 ApplicationDependencies.getSignalCallManager().acceptCall(false);
+               })
+               .onAnyDenied(this::handleDenyCall)
+               .execute();
   }
 
   private void handleAnswerWithVideo() {

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

@@ -1,13 +1,12 @@
 package org.thoughtcrime.securesms.audio;
 
-import android.annotation.TargetApi;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
-import android.os.Build;
+import android.os.ParcelFileDescriptor;
 
 import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
@@ -17,8 +16,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class AudioCodec {
+public class AudioCodec implements Recorder {
 
   private static final String TAG = Log.tag(AudioCodec.class);
 
@@ -51,12 +49,19 @@ public class AudioCodec {
     }
   }
 
+  @Override
+  public void start(ParcelFileDescriptor fileDescriptor) {
+    Log.i(TAG, "Recording voice note using AudioCodec.");
+    start(new ParcelFileDescriptor.AutoCloseOutputStream(fileDescriptor));
+  }
+
+  @Override
   public synchronized void stop() {
     running = false;
     while (!finished) Util.wait(this, 0);
   }
 
-  public void start(final OutputStream outputStream) {
+  private void start(final OutputStream outputStream) {
     new Thread(new Runnable() {
       @Override
       public void run() {

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.audio;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
@@ -13,6 +12,7 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft;
 import org.thoughtcrime.securesms.providers.BlobProvider;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
@@ -20,7 +20,6 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioRecorder {
 
   private static final String TAG = Log.tag(AudioRecorder.class);
@@ -29,8 +28,8 @@ public class AudioRecorder {
 
   private final Context context;
 
-  private AudioCodec audioCodec;
-  private Uri        captureUri;
+  private Recorder recorder;
+  private Uri      captureUri;
 
   public AudioRecorder(@NonNull Context context) {
     this.context = context;
@@ -42,7 +41,7 @@ public class AudioRecorder {
     executor.execute(() -> {
       Log.i(TAG, "Running startRecording() + " + Thread.currentThread().getId());
       try {
-        if (audioCodec != null) {
+        if (recorder != null) {
           throw new AssertionError("We can only record once at a time.");
         }
 
@@ -52,9 +51,9 @@ public class AudioRecorder {
                                  .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
                                  .withMimeType(MediaUtil.AUDIO_AAC)
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
-        audioCodec = new AudioCodec();
 
-        audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
+        recorder = Build.VERSION.SDK_INT >= 26 && FeatureFlags.voiceNoteRecordingV2() ? new MediaRecorderWrapper() : new AudioCodec();
+        recorder.start(fds[1]);
       } catch (IOException e) {
         Log.w(TAG, e);
       }
@@ -67,12 +66,12 @@ public class AudioRecorder {
     final SettableFuture<VoiceNoteDraft> future = new SettableFuture<>();
 
     executor.execute(() -> {
-      if (audioCodec == null) {
+      if (recorder == null) {
         sendToFuture(future, new IOException("MediaRecorder was never initialized successfully!"));
         return;
       }
 
-      audioCodec.stop();
+      recorder.stop();
 
       try {
         long size = MediaUtil.getMediaSize(context, captureUri);
@@ -82,7 +81,7 @@ public class AudioRecorder {
         sendToFuture(future, ioe);
       }
 
-      audioCodec = null;
+      recorder   = null;
       captureUri = null;
     });
 

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

@@ -22,7 +22,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
 import org.thoughtcrime.securesms.media.MediaInput;
@@ -100,7 +100,7 @@ public final class AudioWaveForm {
 
       if (attachment instanceof DatabaseAttachment) {
         try {
-          AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+          AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
           DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
           long               startTime          = System.currentTimeMillis();
 

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

@@ -0,0 +1,61 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.media.MediaRecorder;
+import android.os.ParcelFileDescriptor;
+
+import org.signal.core.util.logging.Log;
+
+import java.io.IOException;
+
+/**
+ * Wrap Android's {@link MediaRecorder} for use with voice notes.
+ */
+public class MediaRecorderWrapper implements Recorder {
+
+  private static final String TAG = Log.tag(MediaRecorderWrapper.class);
+
+  private static final int    SAMPLE_RATE       = 44100;
+  private static final int    CHANNELS          = 1;
+  private static final int    BIT_RATE          = 32000;
+
+  private MediaRecorder recorder = null;
+
+  @Override
+  public void start(ParcelFileDescriptor fileDescriptor) throws IOException {
+    Log.i(TAG, "Recording voice note using MediaRecorderWrapper.");
+    recorder = new MediaRecorder();
+
+    try {
+      recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+      recorder.setOutputFormat(MediaRecorder.OutputFormat.AAC_ADTS);
+      recorder.setOutputFile(fileDescriptor.getFileDescriptor());
+      recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+      recorder.setAudioSamplingRate(SAMPLE_RATE);
+      recorder.setAudioEncodingBitRate(BIT_RATE);
+      recorder.setAudioChannels(CHANNELS);
+      recorder.prepare();
+      recorder.start();
+    } catch (IllegalStateException e) {
+      Log.w(TAG, "Unable to start recording", e);
+      recorder.release();
+      recorder = null;
+      throw new IOException(e);
+    }
+  }
+
+  @Override
+  public void stop() {
+    try {
+      recorder.stop();
+    } catch (RuntimeException e) {
+      if (e.getClass() != RuntimeException.class) {
+        throw e;
+      } else {
+        Log.d(TAG, "Recording stopped with no data captured.");
+      }
+    } finally {
+      recorder.release();
+      recorder = null;
+    }
+  }
+}

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

@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.os.ParcelFileDescriptor;
+
+import java.io.IOException;
+
+/**
+ * Simple abstraction of the interface for the original voice note recording and the new.
+ */
+public interface Recorder {
+  void start(ParcelFileDescriptor fileDescriptor) throws IOException;
+  void stop();
+}

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarBundler.kt

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.avatar
 
 import android.os.Bundle
-import java.lang.IllegalStateException
 
 /**
  * Utility class which encapsulates reading and writing Avatar objects to and from Bundles.

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarColorItem.kt

@@ -4,9 +4,10 @@ import android.view.View
 import android.widget.ImageView
 import com.airbnb.lottie.SimpleColorFilter
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingModel
-import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 
 typealias OnAvatarColorClickListener = (Avatars.ColorPair) -> Unit
 
@@ -20,7 +21,7 @@ data class AvatarColorItem(
 
   companion object {
     fun registerViewHolder(adapter: MappingAdapter, onAvatarColorClickListener: OnAvatarColorClickListener) {
-      adapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it, onAvatarColorClickListener) }, R.layout.avatar_color_item))
+      adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onAvatarColorClickListener) }, R.layout.avatar_color_item))
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarPickerStorage.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.avatar
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
@@ -33,7 +33,7 @@ object AvatarPickerStorage {
   @JvmStatic
   fun cleanOrphans(context: Context) {
     val avatarFiles = FileStorage.getAllFiles(context, DIRECTORY, FILENAME_BASE)
-    val database = DatabaseFactory.getAvatarPickerDatabase(context)
+    val database = SignalDatabase.avatarPicker
     val photoAvatars = database
       .getAllAvatars()
       .filterIsInstance<Avatar.Photo>()

app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt

@@ -11,7 +11,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
 
@@ -44,7 +44,7 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
       val inputStream = BlobProvider.getInstance().getStream(applicationContext, editedImageUri)
       val onDiskUri = AvatarPickerStorage.save(applicationContext, inputStream)
       val photo = AvatarBundler.extractPhoto(args.photoAvatar)
-      val database = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val database = SignalDatabase.avatarPicker
       val newPhoto = photo.copy(uri = onDiskUri, size = size)
 
       database.update(newPhoto)

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt

@@ -28,8 +28,9 @@ import org.thoughtcrime.securesms.groups.ParcelableGroupId
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
 
 /**
@@ -198,18 +199,18 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
 
   private fun openPhotoEditor(photo: Avatar.Photo) {
     Navigation.findNavController(requireView())
-      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToAvatarPhotoEditorFragment(AvatarBundler.bundlePhoto(photo)))
+      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToAvatarPhotoEditorFragment(AvatarBundler.bundlePhoto(photo)))
   }
 
   private fun openVectorEditor(vector: Avatar.Vector) {
     Navigation.findNavController(requireView())
-      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToVectorAvatarCreationFragment(AvatarBundler.bundleVector(vector)))
+      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToVectorAvatarCreationFragment(AvatarBundler.bundleVector(vector)))
   }
 
   private fun openTextEditor(text: Avatar.Text?) {
     val bundle = if (text != null) AvatarBundler.bundleText(text) else null
     Navigation.findNavController(requireView())
-      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToTextAvatarCreationFragment(bundle))
+      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToTextAvatarCreationFragment(bundle))
   }
 
   @Suppress("DEPRECATION")

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerItem.kt

@@ -14,9 +14,10 @@ import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingModel
-import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 import org.thoughtcrime.securesms.util.visible
 
 typealias OnAvatarClickListener = (Avatar, Boolean) -> Unit
@@ -27,7 +28,7 @@ object AvatarPickerItem {
   private val SELECTION_CHANGED = Any()
 
   fun register(adapter: MappingAdapter, onAvatarClickListener: OnAvatarClickListener, onAvatarLongClickListener: OnAvatarLongClickListener) {
-    adapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it, onAvatarClickListener, onAvatarLongClickListener) }, R.layout.avatar_picker_item))
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onAvatarClickListener, onAvatarLongClickListener) }, R.layout.avatar_picker_item))
   }
 
   class Model(val avatar: Avatar, val isSelected: Boolean) : MappingModel<Model> {

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerRepository.kt

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
 import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.profiles.AvatarHelper
@@ -70,11 +70,11 @@ class AvatarPickerRepository(context: Context) {
   }
 
   fun getPersistedAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
-    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForSelf()
+    SignalDatabase.avatarPicker.getAvatarsForSelf()
   }
 
   fun getPersistedAvatarsForGroup(groupId: GroupId): Single<List<Avatar>> = Single.fromCallable {
-    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForGroup(groupId)
+    SignalDatabase.avatarPicker.getAvatarsForGroup(groupId)
   }
 
   fun getDefaultAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
@@ -97,7 +97,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForSelf(avatar: Avatar, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val avatarDatabase = SignalDatabase.avatarPicker
       val savedAvatar = avatarDatabase.saveAvatarForSelf(avatar)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -106,7 +106,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForGroup(avatar: Avatar, groupId: GroupId, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+      val avatarDatabase = SignalDatabase.avatarPicker
       val savedAvatar = avatarDatabase.saveAvatarForGroup(avatar, groupId)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -180,7 +180,7 @@ class AvatarPickerRepository(context: Context) {
   fun delete(avatar: Avatar, onDelete: () -> Unit) {
     SignalExecutors.BOUNDED.execute {
       if (avatar.databaseId is Avatar.DatabaseId.Saved) {
-        val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
+        val avatarDatabase = SignalDatabase.avatarPicker
         avatarDatabase.deleteAvatar(avatar)
       }
       onDelete()

app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationFragment.kt

@@ -27,8 +27,8 @@ import org.thoughtcrime.securesms.components.BoldSelectionTabItem
 import org.thoughtcrime.securesms.components.ControllableTabLayout
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
-import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
 /**
  * Fragment to create an avatar based off of a Vector or Text (via a pager)

app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationFragment.kt

@@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarColorItem
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
-import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
 /**
  * Fragment to create an avatar based off a default vector.

app/src/main/java/org/thoughtcrime/securesms/backup/BackupCountQueries.kt

@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.backup
+
+import org.thoughtcrime.securesms.database.AttachmentDatabase
+import org.thoughtcrime.securesms.database.GroupReceiptDatabase
+import org.thoughtcrime.securesms.database.MmsDatabase
+import org.thoughtcrime.securesms.database.SmsDatabase
+
+/**
+ * Queries used by backup exporter to estimate total counts for various complicated tables.
+ */
+object BackupCountQueries {
+
+  const val mmsCount: String = "SELECT COUNT(*) FROM ${MmsDatabase.TABLE_NAME} WHERE ${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.VIEW_ONCE} <= 0"
+
+  const val smsCount: String = "SELECT COUNT(*) FROM ${SmsDatabase.TABLE_NAME} WHERE ${SmsDatabase.EXPIRES_IN} <= 0"
+
+  @get:JvmStatic
+  val groupReceiptCount: String = """
+      SELECT COUNT(*) FROM ${GroupReceiptDatabase.TABLE_NAME} 
+      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${GroupReceiptDatabase.TABLE_NAME}.${GroupReceiptDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
+      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
+  """.trimIndent()
+
+  @get:JvmStatic
+  val attachmentCount: String = """
+      SELECT COUNT(*) FROM ${AttachmentDatabase.TABLE_NAME} 
+      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${AttachmentDatabase.TABLE_NAME}.${AttachmentDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
+      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
+  """.trimIndent()
+}

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

@@ -13,13 +13,12 @@ import java.security.NoSuchAlgorithmException;
 
 public abstract class FullBackupBase {
 
-  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(FullBackupBase.class);
+  private static final int DIGEST_ROUNDS = 250_000;
 
   static class BackupStream {
     static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {
       try {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
 
         MessageDigest digest = MessageDigest.getInstance("SHA-512");
         byte[]        input  = passphrase.replace(" ", "").getBytes();
@@ -27,8 +26,8 @@ public abstract class FullBackupBase {
 
         if (salt != null) digest.update(salt);
 
-        for (int i=0;i<250000;i++) {
-          if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0));
+        for (int i = 0; i < DIGEST_ROUNDS; i++) {
+          if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
           digest.update(hash);
           hash = digest.digest(input);
         }
@@ -47,20 +46,34 @@ public abstract class FullBackupBase {
     }
 
     private final Type type;
-    private final int count;
+    private final long count;
+    private final long estimatedTotalCount;
 
-    BackupEvent(Type type, int count) {
-      this.type  = type;
-      this.count = count;
+    BackupEvent(Type type, long count, long estimatedTotalCount) {
+      this.type                = type;
+      this.count               = count;
+      this.estimatedTotalCount = estimatedTotalCount;
     }
 
     public Type getType() {
       return type;
     }
 
-    public int getCount() {
+    public long getCount() {
       return count;
     }
+
+    public long getEstimatedTotalCount() {
+      return estimatedTotalCount;
+    }
+
+    public double getCompletionPercentage() {
+      if (estimatedTotalCount == 0) {
+        return 0;
+      }
+
+      return Math.min(99.9f, (double) count * 100L / (double) estimatedTotalCount);
+    }
   }
 
 }

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

@@ -43,7 +43,6 @@ 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;
@@ -76,6 +75,11 @@ public class FullBackupExporter extends FullBackupBase {
 
   private static final String TAG = Log.tag(FullBackupExporter.class);
 
+  private static final long DATABASE_VERSION_RECORD_COUNT = 1L;
+  private static final long TABLE_RECORD_COUNT_MULTIPLIER = 3L;
+  private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
+  private static final long FINAL_MESSAGE_COUNT = 1L;
+
   private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
     SignedPreKeyDatabase.TABLE_NAME,
     OneTimePreKeyDatabase.TABLE_NAME,
@@ -135,58 +139,62 @@ public class FullBackupExporter extends FullBackupBase {
                                      @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
-    BackupFrameOutputStream outputStream = new BackupFrameOutputStream(fileOutputStream, passphrase);
-    int                     count        = 0;
+    BackupFrameOutputStream outputStream          = new BackupFrameOutputStream(fileOutputStream, passphrase);
+    int                     count                 = 0;
+    long                    estimatedCountOutside = 0L;
 
     try {
       outputStream.writeDatabaseVersion(input.getVersion());
       count++;
 
       List<String> tables = exportSchema(input, outputStream);
-      count += tables.size() * 3;
+      count += tables.size() * TABLE_RECORD_COUNT_MULTIPLIER;
+
+      final long estimatedCount = calculateCount(context, input, tables);
+      estimatedCountOutside = estimatedCount;
 
       Stopwatch stopwatch = new Stopwatch("Backup");
 
       for (String table : tables) {
         throwIfCanceled(cancellationSignal);
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (table.equals(StickerDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
-          count = exportTable(table, input, outputStream, null, null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, null, null, count, estimatedCount, cancellationSignal);
         }
         stopwatch.split("table::" + table);
       }
 
       for (BackupProtos.SharedPreference preference : IdentityKeyUtil.getBackupRecord(context)) {
         throwIfCanceled(cancellationSignal);
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
         outputStream.write(preference);
       }
-      
+
       for (BackupProtos.SharedPreference preference : TextSecurePreferences.getPreferencesToSaveToBackup(context)) {
         throwIfCanceled(cancellationSignal);
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
         outputStream.write(preference);
       }
 
       stopwatch.split("prefs");
 
-      count = exportKeyValues(outputStream, SignalStore.getKeysToIncludeInBackup(), count, cancellationSignal);
+      count = exportKeyValues(outputStream, SignalStore.getKeysToIncludeInBackup(), count, estimatedCount, cancellationSignal);
 
       stopwatch.split("key_values");
 
       for (AvatarHelper.Avatar avatar : AvatarHelper.getAvatars(context)) {
         throwIfCanceled(cancellationSignal);
         if (avatar != null) {
-          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
           outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
         }
       }
@@ -199,7 +207,49 @@ public class FullBackupExporter extends FullBackupBase {
       if (closeOutputStream) {
         outputStream.close();
       }
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count));
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count, estimatedCountOutside));
+    }
+  }
+
+  private static long calculateCount(@NonNull Context context, @NonNull SQLiteDatabase input, List<String> tables) {
+    long count = DATABASE_VERSION_RECORD_COUNT + TABLE_RECORD_COUNT_MULTIPLIER * tables.size();
+
+    for (String table : tables) {
+      if (table.equals(MmsDatabase.TABLE_NAME)) {
+        count += getCount(input, BackupCountQueries.mmsCount);
+      } else if (table.equals(SmsDatabase.TABLE_NAME)) {
+        count += getCount(input, BackupCountQueries.smsCount);
+      } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
+        count += getCount(input, BackupCountQueries.getGroupReceiptCount());
+      } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
+        count += getCount(input, BackupCountQueries.getAttachmentCount());
+      } else if (table.equals(StickerDatabase.TABLE_NAME)) {
+        count += getCount(input, "SELECT COUNT(*) FROM " + table);
+      } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
+        count += getCount(input, "SELECT COUNT(*) FROM " + table);
+      }
+    }
+
+    count += IDENTITY_KEY_BACKUP_RECORD_COUNT;
+
+    count += TextSecurePreferences.getPreferencesToSaveToBackupCount(context);
+
+    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
+                                              .getDataSet();
+    for (String key : SignalStore.getKeysToIncludeInBackup()) {
+      if (dataSet.containsKey(key)) {
+        count++;
+      }
+    }
+
+    count += AvatarHelper.getAvatarCount(context);
+
+    return count + FINAL_MESSAGE_COUNT;
+  }
+
+  private static long getCount(@NonNull SQLiteDatabase input, @NonNull String query) {
+    try (Cursor cursor = input.rawQuery(query)) {
+      return cursor.moveToFirst() ? cursor.getLong(0) : 0;
     }
   }
 
@@ -245,6 +295,7 @@ public class FullBackupExporter extends FullBackupBase {
                                  @Nullable Predicate<Cursor> predicate,
                                  @Nullable PostProcessor postProcess,
                                  int count,
+                                 long estimatedCount,
                                  @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
@@ -284,7 +335,7 @@ public class FullBackupExporter extends FullBackupBase {
 
           statement.append(')');
 
-          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
           outputStream.write(statementBuilder.setStatement(statement.toString()).build());
 
           if (postProcess != null) {
@@ -297,7 +348,7 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
+  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
       long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
@@ -322,7 +373,7 @@ public class FullBackupExporter extends FullBackupBase {
         if (random != null && random.length == 32) inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         else                                       inputStream = ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
 
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
         outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
       }
     } catch (IOException e) {
@@ -332,7 +383,7 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
+  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
       long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
@@ -341,7 +392,7 @@ public class FullBackupExporter extends FullBackupBase {
       byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
 
       if (!TextUtils.isEmpty(data) && size > 0) {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
         InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         outputStream.writeSticker(rowId, inputStream, size);
       }
@@ -372,6 +423,7 @@ public class FullBackupExporter extends FullBackupBase {
   private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream,
                                      @NonNull List<String> keysToIncludeInBackup,
                                      int count,
+                                     long estimatedCount,
                                      BackupCancellationSignal cancellationSignal) throws IOException
   {
     KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
@@ -402,7 +454,7 @@ public class FullBackupExporter extends FullBackupBase {
         throw new AssertionError("Unknown type: " + type);
       }
 
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
       outputStream.write(builder.build());
     }
 
@@ -410,12 +462,12 @@ public class FullBackupExporter extends FullBackupBase {
   }
 
   private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
-    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
-           cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
+           cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
   }
 
   private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
-    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
   }
 
   private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long mmsId) {

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

@@ -95,7 +95,7 @@ public class FullBackupImporter extends FullBackupBase {
       BackupFrame frame;
 
       while (!(frame = inputStream.readFrame()).getEnd()) {
-        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
+        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count, 0));
         count++;
 
         if      (frame.hasVersion())    processVersion(db, frame.getVersion());
@@ -115,7 +115,7 @@ public class FullBackupImporter extends FullBackupBase {
       keyValueDatabase.endTransaction();
     }
 
-    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count));
+    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count, 0));
   }
 
   private static @NonNull InputStream getInputStream(@NonNull Context context, @NonNull Uri uri) throws IOException{

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeRepository.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.RecipientDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -19,16 +19,14 @@ class BadgeRepository(context: Context) {
     displayBadgesOnProfile: Boolean,
     selfBadges: List<Badge> = Recipient.self().badges
   ): Completable = Completable.fromAction {
-    val recipientDatabase: RecipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
+    val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
 
+    ProfileUtil.uploadProfileWithBadges(context, badges)
     SignalStore.donationsValues().setDisplayBadgesOnProfile(displayBadgesOnProfile)
-
     recipientDatabase.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
 
-    val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
-    ProfileUtil.uploadProfileWithBadges(context, badges)
-
     recipientDatabase.setBadges(Recipient.self().id, badges)
   }.subscribeOn(Schedulers.io())
 
@@ -37,7 +35,7 @@ class BadgeRepository(context: Context) {
     val reOrderedBadges = listOf(featuredBadge.copy(visible = true)) + (badges.filterNot { it.id == featuredBadge.id })
     ProfileUtil.uploadProfileWithBadges(context, reOrderedBadges)
 
-    val recipientDatabase: RecipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
     recipientDatabase.setBadges(Recipient.self().id, reOrderedBadges)
   }.subscribeOn(Schedulers.io())
 }

app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt

@@ -8,8 +8,8 @@ import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import org.signal.core.util.DimensionUnit
+import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
@@ -21,6 +21,9 @@ import java.math.BigDecimal
 import java.sql.Timestamp
 
 object Badges {
+
+  private val TAG: String = Log.tag(Badges::class.java)
+
   fun DSLConfiguration.displayBadges(
     context: Context,
     badges: List<Badge>,
@@ -37,13 +40,9 @@ object Badges {
       }
       .forEach { customPref(it) }
 
-    val gutter = context.resources.getDimensionPixelSize(R.dimen.dsl_settings_gutter)
-    val buffer = DimensionUnit.DP.toPixels(12f)
-    val gutterExtra = gutter - buffer
     val badgeSize = DimensionUnit.DP.toPixels(88f)
     val windowWidth = context.resources.displayMetrics.widthPixels
-    val availableWidth = windowWidth - gutterExtra
-    val perRow = (availableWidth / badgeSize).toInt()
+    val perRow = (windowWidth / badgeSize).toInt()
 
     val empties = ((perRow - (badges.size % perRow)) % perRow)
     repeat(empties) {
@@ -74,7 +73,9 @@ object Badges {
       "hdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[2]), "hdpi")
       "xxhdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[4]), "xxhdpi")
       "xxxhdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[5]), "xxxhdpi")
-      else -> Pair(getBadgeImageUri(serviceBadge.sprites6[3]), "xdpi")
+      else -> Pair(getBadgeImageUri(serviceBadge.sprites6[3]), "xhdpi")
+    }.also {
+      Log.d(TAG, "Selected badge density ${it.second()}")
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt

@@ -45,9 +45,9 @@ class BadgeSpriteTransformation(
     SMALL(
       "small",
       mapOf(
-        Density.LDPI to FrameSet(Frame(124, 1, 13, 13), Frame(145, 31, 13, 13)),
+        Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)),
         Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)),
-        Density.HDPI to FrameSet(Frame(244, 1, 25, 25), Frame(283, 58, 25, 25)),
+        Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)),
         Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)),
         Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)),
         Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64))
@@ -56,9 +56,9 @@ class BadgeSpriteTransformation(
     MEDIUM(
       "medium",
       mapOf(
-        Density.LDPI to FrameSet(Frame(124, 16, 19, 19), Frame(160, 31, 19, 19)),
+        Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)),
         Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)),
-        Density.HDPI to FrameSet(Frame(244, 28, 37, 37), Frame(310, 58, 37, 37)),
+        Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)),
         Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)),
         Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)),
         Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96))
@@ -67,31 +67,42 @@ class BadgeSpriteTransformation(
     LARGE(
       "large",
       mapOf(
-        Density.LDPI to FrameSet(Frame(145, 1, 28, 28), Frame(124, 46, 28, 28)),
+        Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)),
         Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)),
-        Density.HDPI to FrameSet(Frame(283, 1, 55, 55), Frame(244, 85, 55, 55)),
+        Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)),
         Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)),
         Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)),
         Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144))
       )
     ),
-    BADGE_60(
-      "badge_60",
+    BADGE_64(
+      "badge_64",
       mapOf(
-        Density.LDPI to FrameSet(Frame(124, 76, 45, 45), Frame(124, 76, 45, 45)),
-        Density.MDPI to FrameSet(Frame(163, 101, 60, 60), Frame(163, 101, 60, 60)),
-        Density.HDPI to FrameSet(Frame(244, 151, 90, 90), Frame(244, 151, 90, 90)),
-        Density.XHDPI to FrameSet(Frame(323, 201, 120, 120), Frame(323, 201, 120, 120)),
-        Density.XXHDPI to FrameSet(Frame(483, 301, 180, 180), Frame(483, 301, 180, 180)),
-        Density.XXXHDPI to FrameSet(Frame(643, 401, 240, 240), Frame(643, 401, 240, 240))
+        Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)),
+        Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)),
+        Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)),
+        Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)),
+        Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)),
+        Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256))
+      )
+    ),
+    BADGE_112(
+      "badge_112",
+      mapOf(
+        Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)),
+        Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)),
+        Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)),
+        Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)),
+        Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)),
+        Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448))
       )
     ),
     XLARGE(
       "xlarge",
       mapOf(
-        Density.LDPI to FrameSet(Frame(1, 1, 121, 121), Frame(1, 1, 121, 121)),
+        Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)),
         Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)),
-        Density.HDPI to FrameSet(Frame(1, 1, 241, 241), Frame(1, 1, 241, 241)),
+        Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)),
         Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)),
         Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)),
         Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640))
@@ -105,7 +116,8 @@ class BadgeSpriteTransformation(
           1 -> MEDIUM
           2 -> LARGE
           3 -> XLARGE
-          4 -> BADGE_60
+          4 -> BADGE_64
+          5 -> BADGE_112
           else -> LARGE
         }
       }
@@ -135,7 +147,7 @@ class BadgeSpriteTransformation(
   }
 
   companion object {
-    private const val VERSION = 2
+    private const val VERSION = 3
 
     private fun getDensity(density: String): Density {
       return Density.values().first { it.density == density }

app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt

@@ -14,9 +14,10 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingViewHolder
 import org.thoughtcrime.securesms.util.ThemeUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 import java.security.MessageDigest
 
 typealias OnBadgeClicked = (Badge, Boolean, Boolean) -> Unit
@@ -129,7 +130,7 @@ data class Badge(
         .downsample(DownsampleStrategy.NONE)
         .diskCacheStrategy(DiskCacheStrategy.NONE)
         .transform(
-          BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_60, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)),
+          BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_64, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)),
         )
         .into(badge)
 
@@ -165,8 +166,8 @@ data class Badge(
     private val SELECTION_CHANGED = Any()
 
     fun register(mappingAdapter: MappingAdapter, onBadgeClicked: OnBadgeClicked) {
-      mappingAdapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it, onBadgeClicked) }, R.layout.badge_preference_view))
-      mappingAdapter.registerFactory(EmptyModel::class.java, MappingAdapter.LayoutFactory({ EmptyViewHolder(it) }, R.layout.badge_preference_view))
+      mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onBadgeClicked) }, R.layout.badge_preference_view))
+      mappingAdapter.registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.badge_preference_view))
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgePreview.kt

@@ -6,14 +6,15 @@ import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 
 object BadgePreview {
 
   fun register(mappingAdapter: MappingAdapter) {
-    mappingAdapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it) }, R.layout.featured_badge_preview_preference))
-    mappingAdapter.registerFactory(SubscriptionModel::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it) }, R.layout.subscription_flow_badge_preview_preference))
+    mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.featured_badge_preview_preference))
+    mappingAdapter.registerFactory(SubscriptionModel::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.subscription_flow_badge_preview_preference))
   }
 
   abstract class BadgeModel<T : BadgeModel<T>> : PreferenceModel<T>() {

app/src/main/java/org/thoughtcrime/securesms/badges/models/ExpiredBadge.kt

@@ -4,8 +4,9 @@ import android.view.View
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 
 object ExpiredBadge {
 
@@ -29,6 +30,6 @@ object ExpiredBadge {
   }
 
   fun register(adapter: MappingAdapter) {
-    adapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it) }, R.layout.expired_badge_preference))
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.expired_badge_preference))
   }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/models/LargeBadge.kt

@@ -4,21 +4,22 @@ import android.view.View
 import android.widget.TextView
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingModel
-import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 
 data class LargeBadge(
   val badge: Badge
 ) {
 
-  class Model(val largeBadge: LargeBadge, val shortName: String) : MappingModel<Model> {
+  class Model(val largeBadge: LargeBadge, val shortName: String, val maxLines: Int) : MappingModel<Model> {
     override fun areItemsTheSame(newItem: Model): Boolean {
       return newItem.largeBadge.badge.id == largeBadge.badge.id
     }
 
     override fun areContentsTheSame(newItem: Model): Boolean {
-      return newItem.largeBadge == largeBadge && newItem.shortName == shortName
+      return newItem.largeBadge == largeBadge && newItem.shortName == shortName && newItem.maxLines == maxLines
     }
   }
 
@@ -43,13 +44,16 @@ data class LargeBadge(
 
       name.text = model.largeBadge.badge.name
       description.text = model.largeBadge.badge.resolveDescription(model.shortName)
+      description.setLines(model.maxLines)
+      description.maxLines = model.maxLines
+      description.minLines = model.maxLines
     }
   }
 
   companion object {
     fun register(mappingAdapter: MappingAdapter) {
-      mappingAdapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
-      mappingAdapter.registerFactory(EmptyModel::class.java, MappingAdapter.LayoutFactory({ EmptyViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
+      mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
+      mappingAdapter.registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.badges.self.expired
 
 import androidx.fragment.app.FragmentManager
-import androidx.navigation.fragment.findNavController
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
@@ -10,7 +9,9 @@ import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 
 /**
@@ -26,7 +27,8 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun getConfiguration(): DSLConfiguration {
-    val badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge
+    val badge: Badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge
+    val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
 
     return configure {
       customPref(ExpiredBadge.Model(badge))
@@ -60,7 +62,11 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       noPadTextPref(
         DSLSettingsText.from(
           if (badge.isBoost()) {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology
+            if (isLikelyASustainer) {
+              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
+            } else {
+              R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology
+            }
           } else {
             R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
           },
@@ -73,14 +79,22 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       primaryButton(
         text = DSLSettingsText.from(
           if (badge.isBoost()) {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
+            if (isLikelyASustainer) {
+              R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
+            } else {
+              R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
+            }
           } else {
             R.string.ExpiredBadgeBottomSheetDialogFragment__renew_subscription
           }
         ),
         onClick = {
           dismiss()
-          findNavController().navigate(R.id.action_directly_to_subscribe)
+          if (isLikelyASustainer) {
+            requireActivity().startActivity(AppSettingsActivity.boost(requireContext()))
+          } else {
+            requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext()))
+          }
         }
       )
 

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt

@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.badges.self.none
+
+import android.content.Intent
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import org.signal.core.util.DimensionUnit
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.BadgePreview
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
+import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+
+class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
+
+  private val viewModel: BecomeASustainerViewModel by viewModels(
+    factoryProducer = {
+      BecomeASustainerViewModel.Factory(SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
+    }
+  )
+
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    BadgePreview.register(adapter)
+
+    viewModel.state.observe(viewLifecycleOwner) {
+      adapter.submitList(getConfiguration(it).toMappingModelList())
+    }
+  }
+
+  private fun getConfiguration(state: BecomeASustainerState): DSLConfiguration {
+    return configure {
+      customPref(BadgePreview.Model(badge = state.badge))
+
+      sectionHeaderPref(
+        title = DSLSettingsText.from(
+          R.string.BecomeASustainerFragment__get_badges,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.Title2BoldModifier
+        )
+      )
+
+      space(DimensionUnit.DP.toPixels(8f).toInt())
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.BecomeASustainerFragment__signal_is_a_non_profit,
+          DSLSettingsText.CenterModifier
+        )
+      )
+
+      space(DimensionUnit.DP.toPixels(77f).toInt())
+
+      primaryButton(
+        text = DSLSettingsText.from(
+          R.string.BecomeASustainerMegaphone__become_a_sustainer
+        ),
+        onClick = {
+          requireActivity().finish()
+          requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext()).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
+        }
+      )
+
+      space(DimensionUnit.DP.toPixels(8f).toInt())
+    }
+  }
+
+  companion object {
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      BecomeASustainerFragment().show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerState.kt

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.badges.self.none
+
+import org.thoughtcrime.securesms.badges.models.Badge
+
+data class BecomeASustainerState(
+  val badge: Badge? = null
+)

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerViewModel.kt

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.badges.self.none
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.util.livedata.Store
+
+class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository) : ViewModel() {
+
+  private val store = Store(BecomeASustainerState())
+
+  val state: LiveData<BecomeASustainerState> = store.stateLiveData
+
+  private val disposables = CompositeDisposable()
+
+  init {
+    disposables += subscriptionsRepository.getSubscriptions().subscribeBy(
+      onError = { Log.w(TAG, "Could not load subscriptions.") },
+      onSuccess = { subscriptions ->
+        store.update {
+          it.copy(badge = subscriptions.firstOrNull()?.badge)
+        }
+      }
+    )
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+
+  companion object {
+    private val TAG = Log.tag(BecomeASustainerViewModel::class.java)
+  }
+
+  class Factory(private val subscriptionsRepository: SubscriptionsRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+      return modelClass.cast(BecomeASustainerViewModel(subscriptionsRepository))!!
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt

@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.LifecycleDisposable
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
  * Fragment to allow user to manage options related to the badges they've unlocked.
@@ -37,7 +38,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     Badge.register(adapter) { badge, _, isFaded ->
       if (badge.isExpired() || isFaded) {
-        findNavController().navigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge))
+        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge))
       } else {
         ViewBadgeBottomSheetDialogFragment.show(parentFragmentManager, Recipient.self().id, badge)
       }
@@ -71,7 +72,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
       asyncSwitchPref(
         title = DSLSettingsText.from(R.string.BadgesOverviewFragment__display_badges_on_profile),
         isChecked = state.displayBadgesOnProfile,
-        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges,
+        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges && state.hasInternet,
         isProcessing = state.stage == BadgesOverviewState.Stage.UPDATING_BADGE_DISPLAY_STATE,
         onClick = {
           viewModel.setDisplayBadgesOnProfile(!state.displayBadgesOnProfile)
@@ -81,9 +82,9 @@ class BadgesOverviewFragment : DSLSettingsFragment(
       clickPref(
         title = DSLSettingsText.from(R.string.BadgesOverviewFragment__featured_badge),
         summary = state.featuredBadge?.name?.let { DSLSettingsText.from(it) },
-        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges,
+        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges && state.hasInternet,
         onClick = {
-          findNavController().navigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToFeaturedBadgeFragment())
+          findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToFeaturedBadgeFragment())
         }
       )
     }

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewState.kt

@@ -7,7 +7,8 @@ data class BadgesOverviewState(
   val allUnlockedBadges: List<Badge> = listOf(),
   val featuredBadge: Badge? = null,
   val displayBadgesOnProfile: Boolean = false,
-  val fadedBadgeId: String? = null
+  val fadedBadgeId: String? = null,
+  val hasInternet: Boolean = false
 ) {
 
   val hasUnexpiredBadges = allUnlockedBadges.any { it.expirationTimestamp > System.currentTimeMillis() }

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewViewModel.kt

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.badges.BadgeRepository
 import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
 import org.thoughtcrime.securesms.util.livedata.Store
 import org.whispersystems.libsignal.util.guava.Optional
 
@@ -42,6 +43,12 @@ class BadgesOverviewViewModel(
       )
     }
 
+    disposables += InternetConnectionObserver.observe()
+      .distinctUntilChanged()
+      .subscribeBy { isConnected ->
+        store.update { it.copy(hasInternet = isConnected) }
+      }
+
     disposables += Single.zip(
       subscriptionsRepository.getActiveSubscription(),
       subscriptionsRepository.getSubscriptions()

app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt

@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.badges.view
 
+import android.graphics.Paint
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -22,9 +24,12 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.PlayServicesUtil
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.visible
+import kotlin.math.ceil
+import kotlin.math.max
 
 class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
 
@@ -32,6 +37,13 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
 
   override val peekHeightPercentage: Float = 1f
 
+  private val textWidth: Float
+    get() = (resources.displayMetrics.widthPixels - ViewUtil.dpToPx(64)).toFloat()
+  private val textBounds: Rect = Rect()
+  private val textPaint: Paint = Paint().apply {
+    textSize = ViewUtil.spToPx(16f).toFloat()
+  }
+
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     return inflater.inflate(R.layout.view_badge_bottom_sheet_dialog_fragment, container, false)
   }
@@ -56,7 +68,10 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
       action.setOnClickListener {
         CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url))
       }
-    } else if (FeatureFlags.donorBadges()) {
+    } else if (
+      FeatureFlags.donorBadges() &&
+      Recipient.self().badges.none { it.category == Badge.Category.Donor && !it.isBoost() && !it.isExpired() }
+    ) {
       action.setOnClickListener {
         startActivity(AppSettingsActivity.subscriptions(requireContext()))
       }
@@ -92,9 +107,17 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
 
       tabs.visible = state.allBadgesVisibleOnProfile.size > 1
 
+      var maxLines = 3
+      state.allBadgesVisibleOnProfile.forEach { badge ->
+        val text = badge.resolveDescription(state.recipient.getShortDisplayName(requireContext()))
+        textPaint.getTextBounds(text, 0, text.length, textBounds)
+        val estimatedLines = ceil(textBounds.width().toFloat() / textWidth).toInt()
+        maxLines = max(maxLines, estimatedLines)
+      }
+
       adapter.submitList(
         state.allBadgesVisibleOnProfile.map {
-          LargeBadge.Model(LargeBadge(it), state.recipient.getShortDisplayName(requireContext()))
+          LargeBadge.Model(LargeBadge(it), state.recipient.getShortDisplayName(requireContext()), maxLines + 1)
         }
       ) {
         val stateSelectedIndex = state.allBadgesVisibleOnProfile.indexOf(state.selectedBadge)
@@ -120,7 +143,7 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
       recipientId: RecipientId,
       startBadge: Badge? = null
     ) {
-      if (!FeatureFlags.displayDonorBadges()) {
+      if (!FeatureFlags.displayDonorBadges() && recipientId != Recipient.self().id) {
         return
       }
 

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersRepository.java

@@ -7,8 +7,8 @@ import androidx.core.util.Consumer;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -32,7 +32,7 @@ class BlockedUsersRepository {
 
   void getBlocked(@NonNull Consumer<List<Recipient>> blockedUsers) {
     SignalExecutors.BOUNDED.execute(() -> {
-      RecipientDatabase db = DatabaseFactory.getRecipientDatabase(context);
+      RecipientDatabase db = SignalDatabase.recipients();
       try (RecipientDatabase.RecipientReader reader = db.readerForBlocked(db.getBlocked())) {
         int count = reader.getCount();
         if (count == 0) {

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

@@ -225,6 +225,7 @@ public final class AvatarImageView extends AppCompatImageView {
           blurred = shouldBlur;
 
           GlideRequest<Drawable> request = requestManager.load(photo.contactPhoto)
+                                                         .dontAnimate()
                                                          .fallback(fallbackContactPhotoDrawable)
                                                          .error(fallbackContactPhotoDrawable)
                                                          .diskCacheStrategy(DiskCacheStrategy.ALL)
@@ -290,6 +291,7 @@ public final class AvatarImageView extends AppCompatImageView {
 
     GlideApp.with(this)
             .load(avatarBytes)
+            .dontAnimate()
             .fallback(fallback)
             .error(fallback)
             .diskCacheStrategy(DiskCacheStrategy.ALL)

app/src/main/java/org/thoughtcrime/securesms/components/ButtonStripItemView.kt

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.components
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import org.thoughtcrime.securesms.R
 
@@ -24,7 +26,9 @@ class ButtonStripItemView @JvmOverloads constructor(
 
     val array = context.obtainStyledAttributes(attrs, R.styleable.ButtonStripItemView)
 
-    val icon = array.getDrawable(R.styleable.ButtonStripItemView_bsiv_icon)
+    val iconId = array.getResourceId(R.styleable.ButtonStripItemView_bsiv_icon, -1)
+    val icon: Drawable? = if (iconId > 0) AppCompatResources.getDrawable(context, iconId) else null
+
     val contentDescription = array.getString(R.styleable.ButtonStripItemView_bsiv_icon_contentDescription)
     val label = array.getString(R.styleable.ButtonStripItemView_bsiv_label)
 

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

@@ -28,7 +28,7 @@ import com.airbnb.lottie.model.KeyPath;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -360,8 +360,11 @@ public class ConversationItemFooter extends ConstraintLayout {
           long                   id                = messageRecord.getId();
           boolean                mms               = messageRecord.isMms();
 
-          if (mms) DatabaseFactory.getMmsDatabase(getContext()).markExpireStarted(id);
-          else DatabaseFactory.getSmsDatabase(getContext()).markExpireStarted(id);
+          if (mms) {
+            SignalDatabase.mms().markExpireStarted(id);
+          } else {
+            SignalDatabase.sms().markExpireStarted(id);
+          }
 
           expirationManager.scheduleDeletion(id, mms, messageRecord.getExpiresIn());
         });

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

@@ -17,19 +17,11 @@ public class DeliveryStatusView extends FrameLayout {
 
   private static final String TAG = Log.tag(DeliveryStatusView.class);
 
-  private static final RotateAnimation ROTATION_ANIMATION = new RotateAnimation(0, 360f,
-                                                                                Animation.RELATIVE_TO_SELF, 0.5f,
-                                                                                Animation.RELATIVE_TO_SELF, 0.5f);
-  static {
-    ROTATION_ANIMATION.setInterpolator(new LinearInterpolator());
-    ROTATION_ANIMATION.setDuration(1500);
-    ROTATION_ANIMATION.setRepeatCount(Animation.INFINITE);
-  }
-
-  private final ImageView pendingIndicator;
-  private final ImageView sentIndicator;
-  private final ImageView deliveredIndicator;
-  private final ImageView readIndicator;
+  private final RotateAnimation rotationAnimation;
+  private final ImageView       pendingIndicator;
+  private final ImageView       sentIndicator;
+  private final ImageView       deliveredIndicator;
+  private final ImageView       readIndicator;
 
   public DeliveryStatusView(Context context) {
     this(context, null);
@@ -44,10 +36,17 @@ public class DeliveryStatusView extends FrameLayout {
 
     inflate(context, R.layout.delivery_status_view, this);
 
-    this.deliveredIndicator   = findViewById(R.id.delivered_indicator);
-    this.sentIndicator        = findViewById(R.id.sent_indicator);
-    this.pendingIndicator     = findViewById(R.id.pending_indicator);
-    this.readIndicator        = findViewById(R.id.read_indicator);
+    this.deliveredIndicator = findViewById(R.id.delivered_indicator);
+    this.sentIndicator      = findViewById(R.id.sent_indicator);
+    this.pendingIndicator   = findViewById(R.id.pending_indicator);
+    this.readIndicator      = findViewById(R.id.read_indicator);
+
+    rotationAnimation = new RotateAnimation(0, 360f,
+                                            Animation.RELATIVE_TO_SELF, 0.5f,
+                                            Animation.RELATIVE_TO_SELF, 0.5f);
+    rotationAnimation.setInterpolator(new LinearInterpolator());
+    rotationAnimation.setDuration(1500);
+    rotationAnimation.setRepeatCount(Animation.INFINITE);
 
     if (attrs != null) {
       TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DeliveryStatusView, 0, 0);
@@ -67,7 +66,7 @@ public class DeliveryStatusView extends FrameLayout {
   public void setPending() {
     this.setVisibility(View.VISIBLE);
     pendingIndicator.setVisibility(View.VISIBLE);
-    pendingIndicator.startAnimation(ROTATION_ANIMATION);
+    pendingIndicator.startAnimation(rotationAnimation);
     sentIndicator.setVisibility(View.GONE);
     deliveredIndicator.setVisibility(View.GONE);
     readIndicator.setVisibility(View.GONE);

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

@@ -5,14 +5,10 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.style.CharacterStyle;
-import android.text.style.MetricAffectingSpan;
-import android.text.style.StyleSpan;
-import android.text.style.TypefaceSpan;
 import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
@@ -20,7 +16,6 @@ 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.components.emoji.SimpleEmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.SpanUtil;
@@ -32,9 +27,6 @@ public class FromTextView extends SimpleEmojiTextView {
 
   private static final String TAG = Log.tag(FromTextView.class);
 
-  private final static Typeface  BOLD_TYPEFACE  = Typeface.create("sans-serif-medium", Typeface.NORMAL);
-  private final static Typeface  LIGHT_TYPEFACE = Typeface.create("sans-serif", Typeface.NORMAL);
-
   public FromTextView(Context context) {
     super(context);
   }
@@ -52,8 +44,10 @@ public class FromTextView extends SimpleEmojiTextView {
   }
 
   public void setText(Recipient recipient, boolean read, @Nullable String suffix) {
-    String fromString = recipient.getDisplayName(getContext());
+    setText(recipient, recipient.getDisplayName(getContext()), read, suffix);
+  }
 
+  public void setText(Recipient recipient, @Nullable CharSequence fromString, boolean read, @Nullable String suffix) {
     SpannableStringBuilder builder  = new SpannableStringBuilder();
     SpannableString        fromSpan = new SpannableString(fromString);
     fromSpan.setSpan(getFontSpan(!read), 0, fromSpan.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);

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

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.exifinterface.media.ExifInterface;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.Target;
@@ -66,9 +67,6 @@ public class ZoomingImageView extends FrameLayout {
     this.photoView            = findViewById(R.id.image_view);
     this.subsamplingImageView = findViewById(R.id.subsampling_image_view);
 
-    this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
-    this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
-
     this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
     this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX);
 
@@ -129,6 +127,26 @@ public class ZoomingImageView extends FrameLayout {
     subsamplingImageView.setVisibility(View.VISIBLE);
     photoView.setVisibility(View.GONE);
 
+    // We manually set the orientation ourselves because using
+    // SubsamplingScaleImageView.ORIENTATION_USE_EXIF is unreliable:
+    // https://github.com/signalapp/Signal-Android/issues/11732#issuecomment-963203545
+    try {
+      final InputStream inputStream = PartAuthority.getAttachmentStream(getContext(), uri);
+      final int orientation = BitmapUtil.getExifOrientation(new ExifInterface(inputStream));
+      inputStream.close();
+      if (orientation == ExifInterface.ORIENTATION_ROTATE_90) {
+        subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_90);
+      } else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) {
+        subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_180);
+      } else if (orientation == ExifInterface.ORIENTATION_ROTATE_270) {
+        subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_270);
+      } else {
+        subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_0);
+      }
+    } catch (IOException e) {
+      Log.w(TAG, e);
+    }
+
     subsamplingImageView.setImage(ImageSource.uri(uri));
   }
 

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

@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.Emoj
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DrawableUtil;
-import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.List;

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

@@ -10,9 +10,10 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingAdapter;
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
 
 public class EmojiPageViewGridAdapter extends MappingAdapter implements PopupWindow.OnDismissListener {
 

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.text.Annotation;
 import android.text.Layout;
 import android.text.SpannableStringBuilder;
@@ -12,6 +13,7 @@ import android.text.TextDirectionHeuristic;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.text.method.TransformationMethod;
+import android.text.style.MetricAffectingSpan;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -155,6 +157,8 @@ public class EmojiTextView extends AppCompatTextView {
   }
 
   @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    widthMeasureSpec = applyWidthMeasureRoundingFix(widthMeasureSpec);
+
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     CharSequence text = getText();
     if (getLayout() == null || !measureLastLine || text == null || text.length() == 0) {
@@ -175,6 +179,42 @@ public class EmojiTextView extends AppCompatTextView {
     }
   }
 
+  /**
+   * Starting from API 30, there can be a rounding error in text layout when a non-default font
+   * scale is used. This causes a line break to be inserted where there shouldn't be one. Force the
+   * width to be larger to work around this problem.
+   * https://issuetracker.google.com/issues/173574230
+   *
+   * @param widthMeasureSpec the original measure spec passed to {@link #onMeasure(int, int)}
+   * @return the measure spec with the workaround, or the original one.
+   */
+  private int applyWidthMeasureRoundingFix(int widthMeasureSpec) {
+    if (Build.VERSION.SDK_INT >= 30 && Math.abs(getResources().getConfiguration().fontScale - 1f) > 0.01f) {
+      CharSequence text = getText();
+      if (text != null) {
+        int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
+
+        float measuredTextWidth = hasMetricAffectingSpan(text) ? Layout.getDesiredWidth(text, getPaint()) : getPaint().measureText(text, 0, text.length());
+        int   desiredWidth      = (int) measuredTextWidth + getPaddingLeft() + getPaddingRight();
+
+        if (widthSpecMode == MeasureSpec.AT_MOST && desiredWidth < widthSpecSize) {
+          return MeasureSpec.makeMeasureSpec(desiredWidth + 1, MeasureSpec.EXACTLY);
+        }
+      }
+    }
+
+    return widthMeasureSpec;
+  }
+
+  private boolean hasMetricAffectingSpan(@NonNull CharSequence text) {
+    if (!(text instanceof Spanned)) {
+      return false;
+    }
+
+    return ((Spanned) text).nextSpanTransition(-1, text.length(), MetricAffectingSpan.class) != text.length();
+  }
+
   public int getLastLineWidth() {
     return lastLineWidth;
   }

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

@@ -27,20 +27,20 @@ open class SimpleEmojiTextView @JvmOverloads constructor(
       val endDrawableSize: Int = compoundDrawables[1]?.let { it.intrinsicWidth + compoundDrawablePadding } ?: 0
       val adjustedWidth: Int = width - startDrawableSize - endDrawableSize
 
-      val newContent = if (width == 0 || maxLines == -1) {
+      val newCandidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)
+      val newText = if (newCandidates == null || newCandidates.size() == 0) {
         text
       } else {
-        TextUtils.ellipsize(text, paint, (adjustedWidth * maxLines).toFloat(), TextUtils.TruncateAt.END, false, null)
+        EmojiProvider.emojify(newCandidates, text, this)
       }
 
-      val newCandidates = if (isInEditMode) null else EmojiProvider.getCandidates(newContent)
-      val newText = if (newCandidates == null || newCandidates.size() == 0) {
-        newContent
+      val newContent = if (width == 0 || maxLines == -1) {
+        newText
       } else {
-        EmojiProvider.emojify(newCandidates, newContent, this)
+        TextUtils.ellipsize(newText, paint, (adjustedWidth * maxLines).toFloat(), TextUtils.TruncateAt.END, false, null)
       }
       bufferType = BufferType.SPANNABLE
-      super.setText(newText, type)
+      super.setText(newContent, type)
     }
   }
 

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

@@ -10,8 +10,6 @@ import androidx.appcompat.app.AlertDialog;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;

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

@@ -9,7 +9,6 @@ import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;

app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt

@@ -54,9 +54,16 @@ class SignalBottomActionBar(context: Context, attributeSet: AttributeSet) : Line
     present(this.items)
   }
 
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    super.onSizeChanged(w, h, oldw, oldh)
+
+    if (w != oldw) {
+      present(items)
+    }
+  }
+
   private fun present(items: List<ActionItem>) {
     if (width == 0) {
-      post { present(items) }
       return
     }
 

app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt

@@ -13,10 +13,11 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingModel
-import org.thoughtcrime.securesms.util.MappingViewHolder
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.Factory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 
 /**
  * A custom context menu that will show next to an anchor view and display several options. Basically a PopupMenu with custom UI and positioning rules.
@@ -174,7 +175,7 @@ class SignalContextMenu private constructor(
     }
   }
 
-  private inner class ItemViewHolderFactory : MappingAdapter.Factory<DisplayItem> {
+  private inner class ItemViewHolderFactory : Factory<DisplayItem> {
     override fun createViewHolder(parent: ViewGroup): MappingViewHolder<DisplayItem> {
       return ItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.signal_context_menu_item, parent, false))
     }

app/src/main/java/org/thoughtcrime/securesms/components/reminder/BubbleOptOutReminder.kt

@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.components.reminder
+
+import android.content.Context
+import org.thoughtcrime.securesms.R
+
+class BubbleOptOutReminder(context: Context) : Reminder(null, context.getString(R.string.BubbleOptOutTooltip__description)) {
+
+  init {
+    addAction(Action(context.getString(R.string.BubbleOptOutTooltip__turn_off), R.id.reminder_action_turn_off))
+    addAction(Action(context.getString(R.string.BubbleOptOutTooltip__not_now), R.id.reminder_action_not_now))
+  }
+
+  override fun isDismissable(): Boolean {
+    return false
+  }
+}

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

@@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 @SuppressLint("BatteryLife")
@@ -31,18 +32,13 @@ public class DozeReminder extends Reminder {
       context.startActivity(intent);
     });
 
-    setDismissListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        TextSecurePreferences.setPromptedOptimizeDoze(context, true);
-      }
-    });
+    setDismissListener(v -> TextSecurePreferences.setPromptedOptimizeDoze(context, true));
   }
 
   public static boolean isEligible(Context context) {
-    return TextSecurePreferences.isFcmDisabled(context)            &&
+    return !SignalStore.account().isFcmEnabled()                   &&
            !TextSecurePreferences.hasPromptedOptimizeDoze(context) &&
-           Build.VERSION.SDK_INT >= Build.VERSION_CODES.M          &&
+           Build.VERSION.SDK_INT >= 23                             &&
            !((PowerManager)context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName());
   }
 

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

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.reminder;
 import android.content.Context;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -21,6 +22,6 @@ public class PushRegistrationReminder extends Reminder {
   }
 
   public static boolean isEligible(Context context) {
-    return !TextSecurePreferences.isPushRegistered(context);
+    return !SignalStore.account().isRegistered();
   }
 }

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

@@ -1,11 +1,14 @@
 package org.thoughtcrime.securesms.components.reminder;
 
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
@@ -15,10 +18,12 @@ import java.util.List;
 
 final class ReminderActionsAdapter extends RecyclerView.Adapter<ReminderActionsAdapter.ActionViewHolder> {
 
+  private final Reminder.Importance                importance;
   private final List<Reminder.Action>              actions;
   private final ReminderView.OnActionClickListener actionClickListener;
 
-  ReminderActionsAdapter(List<Reminder.Action> actions, ReminderView.OnActionClickListener actionClickListener) {
+  ReminderActionsAdapter(Reminder.Importance importance, List<Reminder.Action> actions, ReminderView.OnActionClickListener actionClickListener) {
+    this.importance          = importance;
     this.actions             = Collections.unmodifiableList(actions);
     this.actionClickListener = actionClickListener;
   }
@@ -26,7 +31,14 @@ final class ReminderActionsAdapter extends RecyclerView.Adapter<ReminderActionsA
   @NonNull
   @Override
   public ActionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-    return new ActionViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.reminder_action_button, parent, false));
+    Context  context = parent.getContext();
+    TextView button  = ((TextView) LayoutInflater.from(context).inflate(R.layout.reminder_action_button, parent, false));
+
+    if (importance == Reminder.Importance.NORMAL) {
+      button.setTextColor(ContextCompat.getColor(context, R.color.signal_accent_primary));
+    }
+
+    return new ActionViewHolder(button);
   }
 
   @Override

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

@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.DimensionUnit;
 import org.thoughtcrime.securesms.R;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public final class ReminderView extends FrameLayout {
   private ProgressBar           progressBar;
   private TextView              progressText;
   private ViewGroup             container;
+  private View                  background;
   private ImageButton           closeButton;
   private TextView              title;
   private TextView              text;
@@ -56,6 +58,7 @@ public final class ReminderView extends FrameLayout {
     progressBar     = findViewById(R.id.reminder_progress);
     progressText    = findViewById(R.id.reminder_progress_text);
     container       = findViewById(R.id.container);
+    background      = findViewById(R.id.background);
     closeButton     = findViewById(R.id.cancel);
     title           = findViewById(R.id.reminder_title);
     text            = findViewById(R.id.reminder_text);
@@ -79,24 +82,30 @@ public final class ReminderView extends FrameLayout {
     }
 
     text.setText(reminder.getText());
-    text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
 
     switch (reminder.getImportance()) {
       case NORMAL:
-        container.setBackgroundResource(R.drawable.reminder_background_normal);
+        background.setBackgroundResource(R.drawable.reminder_background_normal);
+        title.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
+        text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
         break;
       case ERROR:
-        container.setBackgroundResource(R.drawable.reminder_background_error);
+        background.setBackgroundResource(R.drawable.reminder_background_error);
+        title.setTextColor(ContextCompat.getColor(getContext(), R.color.core_black));
         text.setTextColor(ContextCompat.getColor(getContext(), R.color.core_black));
         break;
       case TERMINAL:
-        container.setBackgroundResource(R.drawable.reminder_background_terminal);
+        background.setBackgroundResource(R.drawable.reminder_background_terminal);
+        title.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
+        text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
         break;
       default:
         throw new IllegalStateException();
     }
 
-    setOnClickListener(reminder.getOkListener());
+    if (reminder.getOkListener() != null) {
+      setOnClickListener(reminder.getOkListener());
+    }
 
     closeButton.setVisibility(reminder.isDismissable() ? View.VISIBLE : View.GONE);
     closeButton.setOnClickListener(new OnClickListener() {
@@ -108,6 +117,10 @@ public final class ReminderView extends FrameLayout {
       }
     });
 
+    if (reminder.getImportance() == Reminder.Importance.NORMAL) {
+      closeButton.setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
+    }
+
     int progress = reminder.getProgress();
     if (progress != -1) {
       progressBar.setProgress(progress);
@@ -121,10 +134,12 @@ public final class ReminderView extends FrameLayout {
 
     List<Reminder.Action> actions = reminder.getActions();
     if (actions.isEmpty()) {
+      text.setPadding(0, 0, 0, ((int) DimensionUnit.DP.toPixels(16f)));
       actionsRecycler.setVisibility(GONE);
     } else {
+      text.setPadding(0, 0, 0, 0);
       actionsRecycler.setVisibility(VISIBLE);
-      actionsRecycler.setAdapter(new ReminderActionsAdapter(actions, this::handleActionClicked));
+      actionsRecycler.setAdapter(new ReminderActionsAdapter(reminder.getImportance(), actions, this::handleActionClicked));
     }
 
     container.setVisibility(View.VISIBLE);

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

@@ -3,7 +3,8 @@ package org.thoughtcrime.securesms.components.settings;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingAdapter;
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter;
 
 /**
  * Reusable adapter for generic settings list.

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

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingModelList;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
 
 import java.io.Serializable;
 import java.util.Objects;

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

@@ -7,8 +7,8 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
 
 import java.util.Objects;
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt

@@ -18,9 +18,10 @@ import org.thoughtcrime.securesms.components.settings.models.Button
 import org.thoughtcrime.securesms.components.settings.models.Space
 import org.thoughtcrime.securesms.components.settings.models.Text
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingViewHolder
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 import org.thoughtcrime.securesms.util.visible
 
 class DSLSettingsAdapter : MappingAdapter() {

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt

@@ -34,6 +34,7 @@ abstract class DSLSettingsBottomSheetFragment(
 
     recyclerView.layoutManager = layoutManagerProducer(requireContext())
     recyclerView.adapter = adapter
+    recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS
 
     bindAdapter(adapter)
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt

@@ -5,6 +5,7 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.EdgeEffect
+import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
@@ -24,9 +25,10 @@ abstract class DSLSettingsFragment(
   val layoutManagerProducer: (Context) -> RecyclerView.LayoutManager = { context -> LinearLayoutManager(context) }
 ) : Fragment(layoutId) {
 
-  private lateinit var recyclerView: RecyclerView
-  private lateinit var scrollAnimationHelper: OnScrollAnimationHelper
+  private var recyclerView: RecyclerView? = null
+  private var scrollAnimationHelper: OnScrollAnimationHelper? = null
 
+  @CallSuper
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     val toolbarShadow: View = view.findViewById(R.id.toolbar_shadow)
@@ -44,16 +46,23 @@ abstract class DSLSettingsFragment(
       toolbar.setOnMenuItemClickListener { onOptionsItemSelected(it) }
     }
 
-    recyclerView = view.findViewById(R.id.recycler)
-    recyclerView.edgeEffectFactory = EdgeEffectFactory()
     scrollAnimationHelper = getOnScrollAnimationHelper(toolbarShadow)
-    val adapter = DSLSettingsAdapter()
+    val settingsAdapter = DSLSettingsAdapter()
 
-    recyclerView.layoutManager = layoutManagerProducer(requireContext())
-    recyclerView.adapter = adapter
-    recyclerView.addOnScrollListener(scrollAnimationHelper)
+    recyclerView = view.findViewById<RecyclerView>(R.id.recycler).apply {
+      edgeEffectFactory = EdgeEffectFactory()
+      layoutManager = layoutManagerProducer(requireContext())
+      adapter = settingsAdapter
+      addOnScrollListener(scrollAnimationHelper!!)
+    }
 
-    bindAdapter(adapter)
+    bindAdapter(settingsAdapter)
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    recyclerView = null
+    scrollAnimationHelper = null
   }
 
   protected open fun getOnScrollAnimationHelper(toolbarShadow: View): OnScrollAnimationHelper {

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt

@@ -53,6 +53,9 @@ sealed class DSLSettingsText {
     override fun modify(context: Context, charSequence: CharSequence): CharSequence {
       return SpanUtil.color(textColor, charSequence)
     }
+
+    override fun equals(other: Any?): Boolean = textColor == (other as? ColorModifier)?.textColor
+    override fun hashCode(): Int = textColor
   }
 
   object CenterModifier : Modifier {
@@ -68,6 +71,9 @@ sealed class DSLSettingsText {
     override fun modify(context: Context, charSequence: CharSequence): CharSequence {
       return SpanUtil.textAppearance(context, textAppearance, charSequence)
     }
+
+    override fun equals(other: Any?): Boolean = textAppearance == (other as? TextAppearanceModifier)?.textAppearance
+    override fun hashCode(): Int = textAppearance
   }
 
   object BoldModifier : Modifier {

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

@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
 
 import java.util.Objects;
 

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

@@ -4,8 +4,8 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
 
 /**
  * Simple progress indicator that can be used multiple times (if provided with different {@link Item#id}s).

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

@@ -10,8 +10,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder;
 
 import java.util.Objects;
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt

@@ -9,6 +9,7 @@ import io.reactivex.rxjava3.subjects.Subject
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileScheduleFragmentArgs
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
 import org.thoughtcrime.securesms.help.HelpFragment
@@ -17,8 +18,10 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.util.CachedInflater
 import org.thoughtcrime.securesms.util.DynamicTheme
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 private const val START_LOCATION = "app.settings.start.location"
+private const val START_ARGUMENTS = "app.settings.start.arguments"
 private const val NOTIFICATION_CATEGORY = "android.intent.category.NOTIFICATION_PREFERENCES"
 private const val STATE_WAS_CONFIGURATION_UPDATED = "app.settings.state.configuration.updated"
 
@@ -47,8 +50,14 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
         StartLocation.PROXY -> AppSettingsFragmentDirections.actionDirectToEditProxyFragment()
         StartLocation.NOTIFICATIONS -> AppSettingsFragmentDirections.actionDirectToNotificationsSettingsFragment()
         StartLocation.CHANGE_NUMBER -> AppSettingsFragmentDirections.actionDirectToChangeNumberFragment()
-        StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions().setSkipToSubscribe(true)
-        StartLocation.MANAGE_SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions()
+        StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions()
+        StartLocation.BOOST -> AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment()
+        StartLocation.MANAGE_SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToManageDonations()
+        StartLocation.NOTIFICATION_PROFILES -> AppSettingsFragmentDirections.actionDirectToNotificationProfiles()
+        StartLocation.CREATE_NOTIFICATION_PROFILE -> AppSettingsFragmentDirections.actionDirectToCreateNotificationProfiles()
+        StartLocation.NOTIFICATION_PROFILE_DETAILS -> AppSettingsFragmentDirections.actionDirectToNotificationProfileDetails(
+          EditNotificationProfileScheduleFragmentArgs.fromBundle(intent.getBundleExtra(START_ARGUMENTS)!!).profileId
+        )
       }
     }
 
@@ -57,7 +66,7 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     }
 
     startingAction?.let {
-      navController.navigate(it)
+      navController.safeNavigate(it)
     }
 
     SignalStore.settings().onConfigurationSettingChanged.observe(this) { key ->
@@ -75,6 +84,12 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     }
   }
 
+  override fun onNewIntent(intent: Intent?) {
+    super.onNewIntent(intent)
+    finish()
+    startActivity(intent)
+  }
+
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
     outState.putBoolean(STATE_WAS_CONFIGURATION_UPDATED, wasConfigurationUpdated)
@@ -118,9 +133,28 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     @JvmStatic
     fun subscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.SUBSCRIPTIONS)
 
+    @JvmStatic
+    fun boost(context: Context): Intent = getIntentForStartLocation(context, StartLocation.BOOST)
+
     @JvmStatic
     fun manageSubscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.MANAGE_SUBSCRIPTIONS)
 
+    @JvmStatic
+    fun notificationProfiles(context: Context): Intent = getIntentForStartLocation(context, StartLocation.NOTIFICATION_PROFILES)
+
+    @JvmStatic
+    fun createNotificationProfile(context: Context): Intent = getIntentForStartLocation(context, StartLocation.CREATE_NOTIFICATION_PROFILE)
+
+    @JvmStatic
+    fun notificationProfileDetails(context: Context, profileId: Long): Intent {
+      val arguments = EditNotificationProfileScheduleFragmentArgs.Builder(profileId, false)
+        .build()
+        .toBundle()
+
+      return getIntentForStartLocation(context, StartLocation.NOTIFICATION_PROFILE_DETAILS)
+        .putExtra(START_ARGUMENTS, arguments)
+    }
+
     private fun getIntentForStartLocation(context: Context, startLocation: StartLocation): Intent {
       return Intent(context, AppSettingsActivity::class.java)
         .putExtra(ARG_NAV_GRAPH, R.navigation.app_settings)
@@ -136,7 +170,11 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     NOTIFICATIONS(4),
     CHANGE_NUMBER(5),
     SUBSCRIPTIONS(6),
-    MANAGE_SUBSCRIPTIONS(7);
+    BOOST(7),
+    MANAGE_SUBSCRIPTIONS(8),
+    NOTIFICATION_PROFILES(9),
+    CREATE_NOTIFICATION_PROFILE(10),
+    NOTIFICATION_PROFILE_DETAILS(11);
 
     companion object {
       fun fromCode(code: Int?): StartLocation {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components.settings.app
 import android.view.View
 import android.widget.TextView
 import androidx.fragment.app.viewModels
-import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
@@ -22,9 +21,10 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.MappingAdapter
-import org.thoughtcrime.securesms.util.MappingViewHolder
 import org.thoughtcrime.securesms.util.PlayServicesUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__menu_settings) {
 
@@ -35,9 +35,9 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
   )
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    adapter.registerFactory(BioPreference::class.java, MappingAdapter.LayoutFactory(::BioPreferenceViewHolder, R.layout.bio_preference_item))
-    adapter.registerFactory(PaymentsPreference::class.java, MappingAdapter.LayoutFactory(::PaymentsPreferenceViewHolder, R.layout.dsl_payments_preference))
-    adapter.registerFactory(SubscriptionPreference::class.java, MappingAdapter.LayoutFactory(::SubscriptionPreferenceViewHolder, R.layout.dsl_preference_item))
+    adapter.registerFactory(BioPreference::class.java, LayoutFactory(::BioPreferenceViewHolder, R.layout.bio_preference_item))
+    adapter.registerFactory(PaymentsPreference::class.java, LayoutFactory(::PaymentsPreferenceViewHolder, R.layout.dsl_payments_preference))
+    adapter.registerFactory(SubscriptionPreference::class.java, LayoutFactory(::SubscriptionPreferenceViewHolder, R.layout.dsl_preference_item))
 
     viewModel.state.observe(viewLifecycleOwner) { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
@@ -54,7 +54,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       customPref(
         BioPreference(state.self) {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_manageProfileActivity)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_manageProfileActivity)
         }
       )
 
@@ -62,7 +62,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.AccountSettingsFragment__account),
         icon = DSLSettingsIcon.from(R.drawable.ic_profile_circle_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_accountSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_accountSettingsFragment)
         }
       )
 
@@ -70,7 +70,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__linked_devices),
         icon = DSLSettingsIcon.from(R.drawable.ic_linked_devices_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_deviceActivity)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)
         }
       )
 
@@ -79,7 +79,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
           PaymentsPreference(
             unreadCount = state.unreadPaymentsCount
           ) {
-            Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_paymentsActivity)
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_paymentsActivity)
           }
         )
       }
@@ -90,7 +90,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__appearance),
         icon = DSLSettingsIcon.from(R.drawable.ic_appearance_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_appearanceSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appearanceSettingsFragment)
         }
       )
 
@@ -98,7 +98,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences_chats__chats),
         icon = DSLSettingsIcon.from(R.drawable.ic_message_tinted_bitmap_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
         }
       )
 
@@ -106,7 +106,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__notifications),
         icon = DSLSettingsIcon.from(R.drawable.ic_bell_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
         }
       )
 
@@ -114,7 +114,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__privacy),
         icon = DSLSettingsIcon.from(R.drawable.ic_lock_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
         }
       )
 
@@ -122,7 +122,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__data_and_storage),
         icon = DSLSettingsIcon.from(R.drawable.ic_archive_24dp),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_dataAndStorageSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_dataAndStorageSettingsFragment)
         }
       )
 
@@ -132,7 +132,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.preferences__help),
         icon = DSLSettingsIcon.from(R.drawable.ic_help_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_helpSettingsFragment)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_helpSettingsFragment)
         }
       )
 
@@ -140,7 +140,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         title = DSLSettingsText.from(R.string.AppSettingsFragment__invite_your_friends),
         icon = DSLSettingsIcon.from(R.drawable.ic_invite_24),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_inviteActivity)
+          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_inviteActivity)
         }
       )
 
@@ -157,11 +157,11 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
             icon = DSLSettingsIcon.from(R.drawable.ic_heart_24),
             isActive = state.hasActiveSubscription,
             onClick = { isActive ->
-              findNavController()
-                .navigate(
-                  AppSettingsFragmentDirections.actionAppSettingsFragmentToSubscriptions()
-                    .setSkipToSubscribe(!isActive)
-                )
+              if (isActive) {
+                findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToManageDonationsFragment())
+              } else {
+                findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToSubscribeFragment())
+              }
             }
           )
         )
@@ -169,7 +169,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
           title = DSLSettingsText.from(R.string.preferences__signal_boost),
           icon = DSLSettingsIcon.from(R.drawable.ic_boost_24),
           onClick = {
-            findNavController().navigate(R.id.action_appSettingsFragment_to_boostsFragment)
+            findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment())
           }
         )
       } else {
@@ -186,7 +186,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         clickPref(
           title = DSLSettingsText.from(R.string.preferences__internal_preferences),
           onClick = {
-            Navigation.findNavController(requireView()).navigate(R.id.action_appSettingsFragment_to_internalSettingsFragment)
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_internalSettingsFragment)
           }
         )
       }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt

@@ -11,6 +11,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.push.exceptions.NotFoundException
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import java.util.concurrent.TimeUnit
 
 class AppSettingsViewModel(private val subscriptionsRepository: SubscriptionsRepository) : ViewModel() {
@@ -37,8 +39,12 @@ class AppSettingsViewModel(private val subscriptionsRepository: SubscriptionsRep
     }
 
     subscriptionsRepository.getActiveSubscription().subscribeBy(
-      onSuccess = { subscription -> store.update { it.copy(hasActiveSubscription = subscription.isActive) } },
+      onSuccess = { subscription -> store.update { it.copy(hasActiveSubscription = subscription.activeSubscription != null) } },
       onError = { throwable ->
+        if (throwable.isNotFoundException()) {
+          Log.w(TAG, "Could not load active subscription due to unset SubscriberId (404).")
+        }
+
         Log.w(TAG, "Could not load active subscription", throwable)
       }
     )
@@ -53,4 +59,8 @@ class AppSettingsViewModel(private val subscriptionsRepository: SubscriptionsRep
   companion object {
     private val TAG = Log.tag(AppSettingsViewModel::class.java)
   }
+
+  private fun Throwable.isNotFoundException(): Boolean {
+    return this is PushNetworkException && this.cause is NotFoundException || this is NotFoundException
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt

@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ThemeUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFragment__account) {
 
@@ -98,7 +99,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__advanced_pin_settings),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_accountSettingsFragment_to_advancedPinSettingsActivity)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_advancedPinSettingsActivity)
         }
       )
 
@@ -110,7 +111,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
         clickPref(
           title = DSLSettingsText.from(R.string.AccountSettingsFragment__change_phone_number),
           onClick = {
-            Navigation.findNavController(requireView()).navigate(R.id.action_accountSettingsFragment_to_changePhoneNumberFragment)
+            Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_changePhoneNumberFragment)
           }
         )
       }
@@ -119,14 +120,14 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
         title = DSLSettingsText.from(R.string.preferences_chats__transfer_account),
         summary = DSLSettingsText.from(R.string.preferences_chats__transfer_account_to_a_new_android_device),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_accountSettingsFragment_to_oldDeviceTransferActivity)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_oldDeviceTransferActivity)
         }
       )
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__delete_account, ContextCompat.getColor(requireContext(), R.color.signal_alert_primary)),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_accountSettingsFragment_to_deleteAccountFragment)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_deleteAccountFragment)
         }
       )
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt

@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class AppearanceSettingsFragment : DSLSettingsFragment(R.string.preferences__appearance) {
 
@@ -44,7 +45,7 @@ class AppearanceSettingsFragment : DSLSettingsFragment(R.string.preferences__app
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__chat_color_and_wallpaper),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_appearanceSettings_to_wallpaperActivity)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_appearanceSettings_to_wallpaperActivity)
         }
       )
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_number_confirm) {
   private lateinit var viewModel: ChangeNumberViewModel
@@ -28,6 +29,6 @@ class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_num
     editNumber.setOnClickListener { findNavController().navigateUp() }
 
     val changeNumber: View = view.findViewById(R.id.change_number_confirm_change_number)
-    changeNumber.setOnClickListener { findNavController().navigate(R.id.action_changePhoneNumberConfirmFragment_to_changePhoneNumberVerifyFragment) }
+    changeNumber.setOnClickListener { findNavController().safeNavigate(R.id.action_changePhoneNumberConfirmFragment_to_changePhoneNumberVerifyFragment) }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt

@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment
 import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragmentArgs
 import org.thoughtcrime.securesms.registration.util.RegistrationNumberInputController
 import org.thoughtcrime.securesms.util.Dialogs
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 private const val OLD_NUMBER_COUNTRY_SELECT = "old_number_country"
 private const val NEW_NUMBER_COUNTRY_SELECT = "new_number_country"
@@ -73,7 +74,7 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
         override fun onPickCountry(view: View) {
           val arguments: CountryPickerFragmentArgs = CountryPickerFragmentArgs.Builder().setResultKey(OLD_NUMBER_COUNTRY_SELECT).build()
 
-          findNavController().navigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
+          findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
         }
 
         override fun setNationalNumber(number: String) {
@@ -110,7 +111,7 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
         override fun onPickCountry(view: View) {
           val arguments: CountryPickerFragmentArgs = CountryPickerFragmentArgs.Builder().setResultKey(NEW_NUMBER_COUNTRY_SELECT).build()
 
-          findNavController().navigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
+          findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
         }
 
         override fun setNationalNumber(number: String) {
@@ -157,7 +158,7 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
     }
 
     when (viewModel.canContinue()) {
-      ContinueStatus.CAN_CONTINUE -> findNavController().navigate(R.id.action_enterPhoneNumberChangeFragment_to_changePhoneNumberConfirmFragment)
+      ContinueStatus.CAN_CONTINUE -> findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_changePhoneNumberConfirmFragment)
       ContinueStatus.INVALID_NUMBER -> {
         Dialogs.showAlertDialog(
           context, getString(R.string.RegistrationActivity_invalid_number), String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.number.e164Number)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt

@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.fragments.BaseEnterSmsCodeFragment
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class ChangeNumberEnterSmsCodeFragment : BaseEnterSmsCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
 
@@ -50,14 +51,14 @@ class ChangeNumberEnterSmsCodeFragment : BaseEnterSmsCodeFragment<ChangeNumberVi
   }
 
   override fun navigateToCaptcha() {
-    findNavController().navigate(R.id.action_changeNumberEnterCodeFragment_to_captchaFragment, getCaptchaArguments())
+    findNavController().safeNavigate(R.id.action_changeNumberEnterCodeFragment_to_captchaFragment, getCaptchaArguments())
   }
 
   override fun navigateToRegistrationLock(timeRemaining: Long) {
-    findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
+    findNavController().safeNavigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
   }
 
   override fun navigateToKbsAccountLocked() {
-    findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
+    findNavController().safeNavigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt

@@ -6,6 +6,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class ChangeNumberFragment : LoggingFragment(R.layout.fragment_change_phone_number) {
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -13,7 +14,7 @@ class ChangeNumberFragment : LoggingFragment(R.layout.fragment_change_phone_numb
     toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
 
     view.findViewById<View>(R.id.change_phone_number_continue).setOnClickListener {
-      findNavController().navigate(R.id.action_changePhoneNumberFragment_to_enterPhoneNumberChangeFragment)
+      findNavController().safeNavigate(R.id.action_changePhoneNumberFragment_to_enterPhoneNumberChangeFragment)
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt

@@ -17,7 +17,6 @@ import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.TextSecurePreferences
 import java.util.Objects
 
 private val TAG: String = Log.tag(ChangeNumberLockActivity::class.java)
@@ -53,11 +52,11 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
     disposables.add(
       changeNumberRepository.whoAmI()
         .flatMap { whoAmI ->
-          if (Objects.equals(whoAmI.number, TextSecurePreferences.getLocalNumber(this))) {
+          if (Objects.equals(whoAmI.number, SignalStore.account().e164)) {
             Log.i(TAG, "Local and remote numbers match, nothing needs to be done.")
             Single.just(false)
           } else {
-            Log.i(TAG, "Local (${TextSecurePreferences.getLocalNumber(this)}) and remote (${whoAmI.number}) numbers do not match, updating local.")
+            Log.i(TAG, "Local (${SignalStore.account().e164}) and remote (${whoAmI.number}) numbers do not match, updating local.")
             changeNumberRepository.changeLocalNumber(whoAmI.number)
               .map { true }
           }
@@ -72,7 +71,7 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
 
     MaterialAlertDialogBuilder(this)
       .setTitle(R.string.ChangeNumberLockActivity__change_status_confirmed)
-      .setMessage(getString(R.string.ChangeNumberLockActivity__your_number_has_been_confirmed_as_s, PhoneNumberFormatter.prettyPrint(TextSecurePreferences.getLocalNumber(this))))
+      .setMessage(getString(R.string.ChangeNumberLockActivity__your_number_has_been_confirmed_as_s, PhoneNumberFormatter.prettyPrint(SignalStore.account().e164!!)))
       .setPositiveButton(android.R.string.ok) { _, _ ->
         startActivity(MainActivity.clearTop(this))
         finish()

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewMod
 import org.thoughtcrime.securesms.util.CircularProgressButtonUtil.cancelSpinning
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layout.fragment_change_number_registration_lock) {
 
@@ -38,7 +39,7 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
   }
 
   override fun navigateToAccountLocked() {
-    findNavController().navigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberAccountLocked())
+    findNavController().safeNavigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberAccountLocked())
   }
 
   override fun handleSuccessfulPinEntry(pin: String) {
@@ -47,7 +48,7 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
     cancelSpinning(pinButton)
 
     if (pinsDiffer) {
-      findNavController().navigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberPinDiffers())
+      findNavController().safeNavigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberPinDiffers())
     } else {
       changeNumberSuccess()
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt

@@ -5,7 +5,7 @@ import androidx.annotation.WorkerThread
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.CertificateType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -13,12 +13,12 @@ import org.thoughtcrime.securesms.pin.KbsRepository
 import org.thoughtcrime.securesms.pin.KeyBackupSystemWrongPinException
 import org.thoughtcrime.securesms.pin.TokenData
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.KbsPinData
 import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
+import java.io.IOException
 
 private val TAG: String = Log.tag(ChangeNumberRepository::class.java)
 
@@ -48,6 +48,8 @@ class ChangeNumberRepository(private val context: Context) {
         ServiceResponse.forExecutionError(e)
       } catch (e: KeyBackupSystemNoDataException) {
         ServiceResponse.forExecutionError(e)
+      } catch (e: IOException) {
+        ServiceResponse.forExecutionError(e)
       }
     }.subscribeOn(Schedulers.io())
   }
@@ -60,9 +62,9 @@ class ChangeNumberRepository(private val context: Context) {
 
   @WorkerThread
   fun changeLocalNumber(e164: String): Single<Unit> {
-    DatabaseFactory.getRecipientDatabase(context).updateSelfPhone(e164)
+    SignalDatabase.recipients.updateSelfPhone(e164)
 
-    TextSecurePreferences.setLocalNumber(context, e164)
+    SignalStore.account().setE164(e164)
 
     ApplicationDependencies.closeConnections()
     ApplicationDependencies.getIncomingMessageObserver()

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberUtil.kt

@@ -9,6 +9,7 @@ import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.registration.fragments.CaptchaFragment
 import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
  * Helpers for various aspects of the change number flow.
@@ -35,7 +36,7 @@ object ChangeNumberUtil {
   }
 
   fun Fragment.changeNumberSuccess() {
-    findNavController().navigate(R.id.action_pop_app_settings_change_number)
+    findNavController().safeNavigate(R.id.action_pop_app_settings_change_number)
     Toast.makeText(requireContext(), R.string.ChangeNumber__your_phone_number_has_been_changed, Toast.LENGTH_SHORT).show()
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
 import org.thoughtcrime.securesms.util.LifecycleDisposable
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 private val TAG: String = Log.tag(ChangeNumberVerifyFragment::class.java)
 
@@ -52,13 +53,13 @@ class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phon
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe { processor ->
           if (processor.hasResult()) {
-            findNavController().navigate(R.id.action_changePhoneNumberVerifyFragment_to_changeNumberEnterCodeFragment)
+            findNavController().safeNavigate(R.id.action_changePhoneNumberVerifyFragment_to_changeNumberEnterCodeFragment)
           } else if (processor.localRateLimit()) {
             Log.i(TAG, "Unable to request sms code due to local rate limit")
-            findNavController().navigate(R.id.action_changePhoneNumberVerifyFragment_to_changeNumberEnterCodeFragment)
+            findNavController().safeNavigate(R.id.action_changePhoneNumberVerifyFragment_to_changeNumberEnterCodeFragment)
           } else if (processor.captchaRequired()) {
             Log.i(TAG, "Unable to request sms code due to captcha required")
-            findNavController().navigate(R.id.action_changePhoneNumberVerifyFragment_to_captchaFragment, getCaptchaArguments())
+            findNavController().safeNavigate(R.id.action_changePhoneNumberVerifyFragment_to_captchaFragment, getCaptchaArguments())
             requestingCaptcha = true
           } else if (processor.rateLimit()) {
             Log.i(TAG, "Unable to request sms code due to rate limit")

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt

@@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.registration.VerifyProcessor
 import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
-import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import java.util.Objects
@@ -167,8 +166,8 @@ class ChangeNumberViewModel(
 
     override fun <T : ViewModel?> create(key: String, modelClass: Class<T>, handle: SavedStateHandle): T {
       val context: Application = ApplicationDependencies.getApplication()
-      val localNumber: String = TextSecurePreferences.getLocalNumber(context)
-      val password: String = TextSecurePreferences.getPushServerPassword(context)
+      val localNumber: String = SignalStore.account().e164!!
+      val password: String = SignalStore.account().servicePassword!!
 
       val viewModel = ChangeNumberViewModel(
         localNumber = localNumber,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt

@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__chats) {
 
@@ -29,7 +30,7 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__sms_mms),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_chatsSettingsFragment_to_smsSettingsFragment)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_smsSettingsFragment)
         }
       )
 
@@ -79,7 +80,7 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
         title = DSLSettingsText.from(R.string.preferences_chats__chat_backups),
         summary = DSLSettingsText.from(if (state.chatBackupsEnabled) R.string.arrays__enabled else R.string.arrays__disabled),
         onClick = {
-          Navigation.findNavController(requireView()).navigate(R.id.action_chatsSettingsFragment_to_backupsPreferenceFragment)
+          Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_backupsPreferenceFragment)
         }
       )
     }