Bump version to 5.33.1

This relates to #12043. There's some xiaomi-specific issue, and this
code was causing a pending intent creation on every app startup,
preventing it from opening. This call shouldn't be necessary unless
screenlock is active.

.idea/codeStyles/Project.xml

@@ -51,6 +51,13 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
     </JetCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="BRACE_STYLE" value="5" />
       <option name="CLASS_BRACE_STYLE" value="5" />

README.md

@@ -59,7 +59,7 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2013-2021 Signal
+Copyright 2013-2022 Signal
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

app/build.gradle

@@ -7,6 +7,7 @@ apply from: 'translations.gradle'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'app.cash.exhaustive'
 apply plugin: 'kotlin-parcelize'
+apply from: 'static-ips.gradle'
 
 repositories {
     maven {
@@ -62,8 +63,8 @@ ktlint {
     version = "0.43.2"
 }
 
-def canonicalVersionCode = 997
-def canonicalVersionName = "5.31.0"
+def canonicalVersionCode = 1020
+def canonicalVersionName = "5.33.1"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -75,18 +76,18 @@ def abiPostFix = ['universal'   : 0,
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
 def selectableVariants = [
-        'nightlyProdFlipper',
+        'nightlyProdSpinner',
         'nightlyProdPerf',
         'nightlyProdRelease',
         'playProdDebug',
-        'playProdFlipper',
+        'playProdSpinner',
         'playProdPerf',
         'playProdRelease',
         'playStagingDebug',
-        'playStagingFlipper',
+        'playStagingSpinner',
         'playStagingPerf',
         'playStagingRelease',
-        'websiteProdFlipper',
+        'websiteProdSpinner',
         'websiteProdRelease',
 ]
 
@@ -117,6 +118,48 @@ android {
         }
     }
 
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError true
+        baseline file("lint-baseline.xml")
+        disable "LintError"
+    }
+
+    sourceSets {
+        test {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+
+        androidTest {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'LICENSE'
+        exclude 'NOTICE'
+        exclude 'asm-license.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
+
+
     defaultConfig {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
@@ -144,9 +187,17 @@ android {
         buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\"}"
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
+        buildConfigField "String[]", "SIGNAL_SERVICE_IPS", service_ips
+        buildConfigField "String[]", "SIGNAL_STORAGE_IPS", storage_ips
+        buildConfigField "String[]", "SIGNAL_CDN_IPS", cdn_ips
+        buildConfigField "String[]", "SIGNAL_CDN2_IPS", cdn2_ips
+        buildConfigField "String[]", "SIGNAL_CDS_IPS", cds_ips
+        buildConfigField "String[]", "SIGNAL_KBS_IPS", kbs_ips
+        buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
+        buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
         buildConfigField "String", "CDSH_PUBLIC_KEY", "\"2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74\""
-        buildConfigField "String", "CDSH_CODE_HASH", "\"ec58c0d7561de8d5657f3a4b22a635eaa305204e9359dcc80a99dfd0c5f1cbf2\""
+        buildConfigField "String", "CDSH_CODE_HASH", "\"2f79dc6c1599b71c70fc2d14f3ea2e3bc65134436eb87011c88845b137af673a\""
         buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
         buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
                                                                                                                            "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
@@ -161,8 +212,8 @@ android {
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
-        buildConfigField "int[]", "MOBILE_COIN_BLACKLIST", "new int[]{98,963,53,850,7}"
         buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
+        buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\""
         buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
 
         buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
@@ -190,36 +241,6 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
 
-    testOptions {
-        execution 'ANDROIDX_TEST_ORCHESTRATOR'
-    }
-
-    sourceSets {
-        test {
-            java.srcDirs += "$projectDir/src/testShared"
-        }
-
-        androidTest {
-            java.srcDirs += "$projectDir/src/testShared"
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility JAVA_VERSION
-        targetCompatibility JAVA_VERSION
-    }
-
-    packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
-        exclude 'asm-license.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/proguard/androidx-annotations.pro'
-    }
-
     buildTypes {
         debug {
             if (keystores['debug'] != null) {
@@ -250,12 +271,12 @@ android {
 
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
         }
-        flipper {
+        spinner {
             initWith debug
             isDefault false
             minifyEnabled false
             matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Flipper\""
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Spinner\""
         }
         release {
             minifyEnabled true
@@ -331,6 +352,7 @@ android {
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
+            buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\""
             buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
 
             buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
@@ -344,6 +366,9 @@ android {
                 output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
                 def tag = getCurrentGitTag()
                 if (tag != null && tag.length() > 0) {
+                    if (tag.startsWith("v")) {
+                        tag = tag.substring(1)
+                    }
                     output.versionNameOverride = tag
                 }
             } else {
@@ -368,19 +393,6 @@ android {
             variant.setIgnore(true)
         }
     }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        disable "LintError"
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
 }
 
 dependencies {
@@ -506,9 +518,8 @@ dependencies {
     }
     implementation libs.dnsjava
 
-    flipperImplementation libs.facebook.flipper
-    flipperImplementation libs.facebook.soloader
-    flipperImplementation libs.square.leakcanary
+    spinnerImplementation project(":spinner")
+    spinnerImplementation libs.square.leakcanary
 
     testImplementation testLibs.junit.junit
     testImplementation testLibs.assertj.core

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

@@ -0,0 +1,118 @@
+package org.thoughtcrime.securesms.database
+
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.DistributionListRecord
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.push.ACI
+import java.lang.IllegalStateException
+import java.util.UUID
+
+class DistributionListDatabaseTest {
+
+  private lateinit var distributionDatabase: DistributionListDatabase
+
+  @Before
+  fun setup() {
+    distributionDatabase = SignalDatabase.distributionLists
+  }
+
+  @Test
+  fun createList_whenNoConflict_insertSuccessfully() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+  }
+
+  @Test
+  fun createList_whenNameConflict_failToInsert() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val id2: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNull(id2)
+  }
+
+  @Test
+  fun getList_returnCorrectList() {
+    createRecipients(3)
+    val members: List<RecipientId> = recipientList(1, 2, 3)
+
+    val id: DistributionListId? = distributionDatabase.createList("test", members)
+    Assert.assertNotNull(id)
+
+    val record: DistributionListRecord? = distributionDatabase.getList(id!!)
+    Assert.assertNotNull(record)
+    Assert.assertEquals(id, record!!.id)
+    Assert.assertEquals("test", record.name)
+    Assert.assertEquals(members, record.members)
+  }
+
+  @Test
+  fun getMembers_returnsCorrectMembers() {
+    createRecipients(3)
+    val members: List<RecipientId> = recipientList(1, 2, 3)
+
+    val id: DistributionListId? = distributionDatabase.createList("test", members)
+    Assert.assertNotNull(id)
+
+    val foundMembers: List<RecipientId> = distributionDatabase.getMembers(id!!)
+    Assert.assertEquals(members, foundMembers)
+  }
+
+  @Test
+  fun givenStoryExists_getStoryType_returnsStoryWithReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val storyType = distributionDatabase.getStoryType(id!!)
+    Assert.assertEquals(StoryType.STORY_WITH_REPLIES, storyType)
+  }
+
+  @Test
+  fun givenStoryExistsAndMarkedNoReplies_getStoryType_returnsStoryWithoutReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+    distributionDatabase.setAllowsReplies(id!!, false)
+
+    val storyType = distributionDatabase.getStoryType(id)
+    Assert.assertEquals(StoryType.STORY_WITHOUT_REPLIES, storyType)
+  }
+
+  @Test
+  fun givenStoryExistsAndMarkedNoReplies_getAllListsForContactSelectionUi_returnsStoryWithoutReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+    distributionDatabase.setAllowsReplies(id!!, false)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertFalse(records.first().allowsReplies)
+  }
+
+  @Test
+  fun givenStoryExists_getAllListsForContactSelectionUi_returnsStoryWithReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertTrue(records.first().allowsReplies)
+  }
+
+  @Test(expected = IllegalStateException::class)
+  fun givenStoryDoesNotExist_getStoryType_throwsIllegalStateException() {
+    distributionDatabase.getStoryType(DistributionListId.from(12))
+    Assert.fail("Expected an assertion error.")
+  }
+
+  private fun createRecipients(count: Int) {
+    for (i in 0 until count) {
+      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+    }
+  }
+
+  private fun recipientList(vararg ids: Long): List<RecipientId> {
+    return ids.map { RecipientId.from(it) }
+  }
+}

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

@@ -4,7 +4,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -30,10 +29,16 @@ class RecipientDatabaseTest {
 
   private lateinit var recipientDatabase: RecipientDatabase
 
+  private val localAci = ACI.from(UUID.randomUUID())
+  private val localPni = PNI.from(UUID.randomUUID())
+
   @Before
   fun setup() {
     recipientDatabase = SignalDatabase.recipients
     ensureDbEmpty()
+
+    SignalStore.account().setAci(localAci)
+    SignalStore.account().setPni(localPni)
   }
 
   // ==============================================================
@@ -46,7 +51,7 @@ class RecipientDatabaseTest {
     val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
 
     val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
+    assertEquals(ACI_A, recipient.requireServiceId())
     assertFalse(recipient.hasE164())
   }
 
@@ -56,7 +61,7 @@ class RecipientDatabaseTest {
     val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, false)
 
     val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
+    assertEquals(ACI_A, recipient.requireServiceId())
     assertFalse(recipient.hasE164())
   }
 
@@ -67,7 +72,7 @@ class RecipientDatabaseTest {
 
     val recipient = Recipient.resolved(recipientId)
     assertEquals(E164_A, recipient.requireE164())
-    assertFalse(recipient.hasAci())
+    assertFalse(recipient.hasServiceId())
   }
 
   /** If all you have is an E164, you can just store that, regardless of trust level. */
@@ -77,7 +82,7 @@ class RecipientDatabaseTest {
 
     val recipient = Recipient.resolved(recipientId)
     assertEquals(E164_A, recipient.requireE164())
-    assertFalse(recipient.hasAci())
+    assertFalse(recipient.hasServiceId())
   }
 
   /** With high trust, you can associate an ACI-e164 pair. */
@@ -86,7 +91,7 @@ class RecipientDatabaseTest {
     val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
     val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
+    assertEquals(ACI_A, recipient.requireServiceId())
     assertEquals(E164_A, recipient.requireE164())
   }
 
@@ -96,7 +101,7 @@ class RecipientDatabaseTest {
     val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
 
     val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
+    assertEquals(ACI_A, recipient.requireServiceId())
     assertFalse(recipient.hasE164())
   }
 
@@ -107,26 +112,26 @@ class RecipientDatabaseTest {
   /** With high trust, you can associate an e164 with an existing ACI. */
   @Test
   fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
 
     val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
   /** With low trust, you cannot associate an ACI-e164 pair, and therefore cannot store the e164. */
   @Test
   fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_lowTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
 
     val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
   }
 
@@ -139,7 +144,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_B, retrievedRecipient.requireE164())
   }
 
@@ -152,7 +157,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
@@ -169,7 +174,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
@@ -182,12 +187,12 @@ class RecipientDatabaseTest {
     assertNotEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
 
     val existingRecipient = Recipient.resolved(existingId)
     assertEquals(E164_A, existingRecipient.requireE164())
-    assertFalse(existingRecipient.hasAci())
+    assertFalse(existingRecipient.hasServiceId())
   }
 
   /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. But high trust lets us take the e164 from the current holder. */
@@ -201,14 +206,12 @@ class RecipientDatabaseTest {
     assertNotEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
+    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
-    assertEquals(PNI_A, retrievedRecipient.pni.get())
 
     val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
+    assertEquals(ACI_A, existingRecipient.requireServiceId())
     assertFalse(existingRecipient.hasE164())
-    assertNull(existingRecipient.pni.orNull())
   }
 
   /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. And low trust means we can’t take the e164. */
@@ -220,11 +223,11 @@ class RecipientDatabaseTest {
     assertNotEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
+    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
 
     val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
+    assertEquals(ACI_A, existingRecipient.requireServiceId())
     assertEquals(E164_A, existingRecipient.requireE164())
   }
 
@@ -243,11 +246,11 @@ class RecipientDatabaseTest {
     assertNotEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
+    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
 
     val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
+    assertEquals(ACI_A, existingRecipient.requireServiceId())
     assertEquals(E164_A, existingRecipient.requireE164())
   }
 
@@ -264,7 +267,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
@@ -281,7 +284,7 @@ class RecipientDatabaseTest {
     assertEquals(existingAciId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
 
     val existingE164Recipient = Recipient.resolved(existingE164Id)
@@ -304,7 +307,7 @@ class RecipientDatabaseTest {
     assertEquals(existingAciId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
 
     val existingE164Recipient = Recipient.resolved(existingE164Id)
@@ -317,19 +320,19 @@ class RecipientDatabaseTest {
   /** Low trust means you can’t merge. If you’re retrieving a user from the table with this data, prefer the ACI one. */
   @Test
   fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_lowTrust() {
-    val existingAciId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
+    val existingAciId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
     val existingE164Id: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
 
     val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
     assertEquals(existingAciId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
 
     val existingE164Recipient = Recipient.resolved(existingE164Id)
     assertEquals(E164_A, existingE164Recipient.requireE164())
-    assertFalse(existingE164Recipient.hasAci())
+    assertFalse(existingE164Recipient.hasServiceId())
   }
 
   /** Another high trust case. No new rules here, just a more complex scenario to show how different rules interact. */
@@ -345,11 +348,11 @@ class RecipientDatabaseTest {
     assertEquals(existingId1, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
 
     val existingRecipient2 = Recipient.resolved(existingId2)
-    assertEquals(ACI_B, existingRecipient2.requireAci())
+    assertEquals(ACI_B, existingRecipient2.requireServiceId())
     assertFalse(existingRecipient2.hasE164())
 
     assert(changeNumberListener.numberChangeWasEnqueued)
@@ -365,11 +368,11 @@ class RecipientDatabaseTest {
     assertEquals(existingId1, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_B, retrievedRecipient.requireE164())
 
     val existingRecipient2 = Recipient.resolved(existingId2)
-    assertEquals(ACI_B, existingRecipient2.requireAci())
+    assertEquals(ACI_B, existingRecipient2.requireServiceId())
     assertEquals(E164_A, existingRecipient2.requireE164())
   }
 
@@ -386,7 +389,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId1, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
 
     assertFalse(recipientDatabase.getByE164(E164_B).isPresent)
@@ -411,11 +414,11 @@ class RecipientDatabaseTest {
     assertEquals(existingId2, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertFalse(retrievedRecipient.hasE164())
 
     val recipientWithId1 = Recipient.resolved(existingId1)
-    assertEquals(ACI_B, recipientWithId1.requireAci())
+    assertEquals(ACI_B, recipientWithId1.requireServiceId())
     assertEquals(E164_A, recipientWithId1.requireE164())
   }
 
@@ -434,7 +437,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
@@ -453,7 +456,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_B, retrievedRecipient.requireE164())
   }
 
@@ -469,7 +472,7 @@ class RecipientDatabaseTest {
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_B, retrievedRecipient.requireE164())
 
     changeNumberListener.waitForJobManager()
@@ -500,18 +503,18 @@ class RecipientDatabaseTest {
   @Test
   fun createByUuidSanityCheck() {
     // GIVEN one recipient
-    val recipientId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
+    val recipientId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
 
     // WHEN I retrieve one by UUID
-    val possible: Optional<RecipientId> = recipientDatabase.getByAci(ACI_A)
+    val possible: Optional<RecipientId> = recipientDatabase.getByServiceId(ACI_A)
 
     // THEN I get it back, and it has the properties I expect
     assertTrue(possible.isPresent)
     assertEquals(recipientId, possible.get())
 
     val recipient = Recipient.resolved(recipientId)
-    assertTrue(recipient.aci.isPresent)
-    assertEquals(ACI_A, recipient.aci.get())
+    assertTrue(recipient.serviceId.isPresent)
+    assertEquals(ACI_A, recipient.serviceId.get())
   }
 
   @Test(expected = IllegalArgumentException::class)

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

@@ -17,11 +17,14 @@ 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.DistributionListId
+import org.thoughtcrime.securesms.database.model.DistributionListRecord
 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.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -33,6 +36,7 @@ import org.whispersystems.libsignal.SignalProtocolAddress
 import org.whispersystems.libsignal.state.SessionRecord
 import org.whispersystems.libsignal.util.guava.Optional
 import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
 import org.whispersystems.signalservice.api.util.UuidUtil
 import java.util.UUID
 
@@ -50,6 +54,10 @@ class RecipientDatabaseTest_merges {
   private lateinit var mentionDatabase: MentionDatabase
   private lateinit var reactionDatabase: ReactionDatabase
   private lateinit var notificationProfileDatabase: NotificationProfileDatabase
+  private lateinit var distributionListDatabase: DistributionListDatabase
+
+  private val localAci = ACI.from(UUID.randomUUID())
+  private val localPni = PNI.from(UUID.randomUUID())
 
   @Before
   fun setup() {
@@ -64,6 +72,10 @@ class RecipientDatabaseTest_merges {
     mentionDatabase = SignalDatabase.mentions
     reactionDatabase = SignalDatabase.reactions
     notificationProfileDatabase = SignalDatabase.notificationProfiles
+    distributionListDatabase = SignalDatabase.distributionLists
+
+    SignalStore.account().setAci(localAci)
+    SignalStore.account().setPni(localPni)
 
     ensureDbEmpty()
   }
@@ -72,9 +84,9 @@ class RecipientDatabaseTest_merges {
   @Test
   fun getAndPossiblyMerge_general() {
     // Setup
-    val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
+    val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
     val recipientIdE164: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_B)
+    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromServiceId(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
@@ -99,7 +111,7 @@ class RecipientDatabaseTest_merges {
     identityDatabase.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
     identityDatabase.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
 
-    sessionDatabase.store(SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
+    sessionDatabase.store(localAci, 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))
@@ -112,6 +124,8 @@ class RecipientDatabaseTest_merges {
     notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
     notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
 
+    val distributionListId: DistributionListId = distributionListDatabase.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
+
     // Merge
     val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
@@ -119,7 +133,7 @@ class RecipientDatabaseTest_merges {
 
     // Recipient validation
     val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
     assertEquals(E164_A, retrievedRecipient.requireE164())
 
     val existingE164Recipient = Recipient.resolved(recipientIdE164)
@@ -175,7 +189,7 @@ class RecipientDatabaseTest_merges {
     assertNull(identityDatabase.getIdentityStoreRecord(E164_A))
 
     // Session validation
-    assertNotNull(sessionDatabase.load(SignalProtocolAddress(ACI_A.toString(), 1)))
+    assertNotNull(sessionDatabase.load(localAci, SignalProtocolAddress(ACI_A.toString(), 1)))
 
     // Reaction validation
     val reactionsSms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(smsId1, false))
@@ -193,6 +207,11 @@ class RecipientDatabaseTest_merges {
 
     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))
+
+    // Distribution List validation
+    val updatedList: DistributionListRecord = distributionListDatabase.getList(distributionListId)!!
+
+    assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
   }
 
   private val context: Application

app/src/flipper/AndroidManifest.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="org.thoughtcrime.securesms">
-
-    <application
-        android:name=".FlipperApplicationContext"
-        tools:replace="android:name">
-
-        <activity
-            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-            android:exported="true" />
-
-    </application>
-
-</manifest>

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

@@ -1,60 +0,0 @@
-package org.thoughtcrime.securesms
-
-import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
-import com.facebook.soloader.SoLoader
-import leakcanary.LeakCanary
-import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter
-import shark.AndroidReferenceMatchers
-
-class FlipperApplicationContext : ApplicationContext() {
-  override fun onCreate() {
-    super.onCreate()
-    SoLoader.init(this, false)
-
-    val client = AndroidFlipperClient.getInstance(this)
-    client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
-    client.addPlugin(DatabasesFlipperPlugin(FlipperSqlCipherAdapter(this)))
-    client.addPlugin(SharedPreferencesFlipperPlugin(this))
-    client.start()
-
-    LeakCanary.config = LeakCanary.config.copy(
-      referenceMatchers = AndroidReferenceMatchers.appDefaults +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "android.service.media.MediaBrowserService\$ServiceBinder",
-          fieldName = "this\$0"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "androidx.media.MediaBrowserServiceCompat\$MediaBrowserServiceImplApi26\$MediaBrowserServiceApi26",
-          fieldName = "mBase"
-        ) +
-        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"
-        ) +
-        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

@@ -1,271 +0,0 @@
-package org.thoughtcrime.securesms.database;
-
-import android.app.Application;
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.facebook.flipper.plugins.databases.DatabaseDescriptor;
-import com.facebook.flipper.plugins.databases.DatabaseDriver;
-
-import net.zetetic.database.DatabaseUtils;
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
-import net.zetetic.database.sqlcipher.SQLiteStatement;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * A lot of this code is taken from {@link com.facebook.flipper.plugins.databases.impl.SqliteDatabaseDriver}
- * and made to work with SqlCipher. Unfortunately I couldn't use it directly, nor subclass it.
- */
-public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdapter.Descriptor> {
-
-  private static final String TAG = Log.tag(FlipperSqlCipherAdapter.class);
-
-  public FlipperSqlCipherAdapter(Context context) {
-    super(context);
-  }
-
-  @Override
-  public List<Descriptor> getDatabases() {
-    try {
-      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),
-                           new Descriptor(megaphoneOpenHelper),
-                           new Descriptor(jobManagerOpenHelper),
-                           new Descriptor(metricsOpenHelper));
-    } catch (Exception e) {
-      Log.i(TAG, "Unable to use reflection to access raw database.", e);
-    }
-    return Collections.emptyList();
-  }
-
-  @Override
-  public List<String> getTableNames(Descriptor descriptor) {
-    SQLiteDatabase db         = descriptor.getReadable();
-    List<String>   tableNames = new ArrayList<>();
-
-    try (Cursor cursor = db.rawQuery("SELECT name FROM sqlite_master WHERE type IN (?, ?)", new String[] { "table", "view" })) {
-      while (cursor != null && cursor.moveToNext()) {
-        tableNames.add(cursor.getString(0));
-      }
-    }
-
-    return tableNames;
-  }
-
-  @Override
-  public DatabaseGetTableDataResponse getTableData(Descriptor descriptor, String table, String order, boolean reverse, int start, int count) {
-    SQLiteDatabase db = descriptor.getReadable();
-
-    long   total   = DatabaseUtils.queryNumEntries(db, table);
-    String orderBy = order != null ? order + (reverse ? " DESC" : " ASC") : null;
-    String limitBy = start + ", " + count;
-
-    try (Cursor cursor = db.query(table, null, null, null, null, null, orderBy, limitBy)) {
-      String[]           columnNames = cursor.getColumnNames();
-      List<List<Object>> rows        = cursorToList(cursor);
-
-      return new DatabaseGetTableDataResponse(Arrays.asList(columnNames), rows, start, rows.size(), total);
-    }
-  }
-
-  @Override
-  public DatabaseGetTableStructureResponse getTableStructure(Descriptor descriptor, String table) {
-    SQLiteDatabase db = descriptor.getReadable();
-
-    Map<String, String> foreignKeyValues = new HashMap<>();
-
-    try(Cursor cursor = db.rawQuery("PRAGMA foreign_key_list(" + table + ")", null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        String from      = cursor.getString(cursor.getColumnIndex("from"));
-        String to        = cursor.getString(cursor.getColumnIndex("to"));
-        String tableName = cursor.getString(cursor.getColumnIndex("table")) + "(" + to + ")";
-
-        foreignKeyValues.put(from, tableName);
-      }
-    }
-
-
-    List<String>        structureColumns = Arrays.asList("column_name", "data_type", "nullable", "default", "primary_key", "foreign_key");
-    List<List<Object>>  structureValues = new ArrayList<>();
-
-    try (Cursor cursor = db.rawQuery("PRAGMA table_info(" + table + ")", null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        String columnName = cursor.getString(cursor.getColumnIndex("name"));
-        String foreignKey = foreignKeyValues.containsKey(columnName) ? foreignKeyValues.get(columnName) : null;
-
-        structureValues.add(Arrays.asList(columnName,
-                                          cursor.getString(cursor.getColumnIndex("type")),
-                                          cursor.getInt(cursor.getColumnIndex("notnull")) == 0,
-                                          getObjectFromColumnIndex(cursor, cursor.getColumnIndex("dflt_value")),
-                                          cursor.getInt(cursor.getColumnIndex("pk")) == 1,
-                                          foreignKey));
-      }
-    }
-
-
-    List<String>       indexesColumns = Arrays.asList("index_name", "unique", "indexed_column_name");
-    List<List<Object>> indexesValues  = new ArrayList<>();
-
-    try (Cursor indexesCursor = db.rawQuery("PRAGMA index_list(" + table + ")", null)) {
-      List<String> indexedColumnNames = new ArrayList<>();
-      String       indexName          = indexesCursor.getString(indexesCursor.getColumnIndex("name"));
-
-      try(Cursor indexInfoCursor = db.rawQuery("PRAGMA index_info(" + indexName + ")", null)) {
-        while (indexInfoCursor.moveToNext()) {
-          indexedColumnNames.add(indexInfoCursor.getString(indexInfoCursor.getColumnIndex("name")));
-        }
-      }
-
-      indexesValues.add(Arrays.asList(indexName,
-                                      indexesCursor.getInt(indexesCursor.getColumnIndex("unique")) == 1,
-                                      TextUtils.join(",", indexedColumnNames)));
-
-    }
-
-    return new DatabaseGetTableStructureResponse(structureColumns, structureValues, indexesColumns, indexesValues);
-  }
-
-  @Override
-  public DatabaseGetTableInfoResponse getTableInfo(Descriptor databaseDescriptor, String table) {
-    SQLiteDatabase db = databaseDescriptor.getReadable();
-
-    try (Cursor cursor = db.rawQuery("SELECT sql FROM sqlite_master WHERE name = ?", new String[] { table })) {
-      cursor.moveToFirst();
-      return new DatabaseGetTableInfoResponse(cursor.getString(cursor.getColumnIndex("sql")));
-    }
-  }
-
-  @Override
-  public DatabaseExecuteSqlResponse executeSQL(Descriptor descriptor, String query) {
-    SQLiteDatabase db = descriptor.getWritable();
-
-    String firstWordUpperCase = getFirstWord(query).toUpperCase();
-
-    switch (firstWordUpperCase) {
-      case "UPDATE":
-      case "DELETE":
-        return executeUpdateDelete(db, query);
-      case "INSERT":
-        return executeInsert(db, query);
-      case "SELECT":
-      case "PRAGMA":
-      case "EXPLAIN":
-        return executeSelect(db, query);
-      default:
-        return executeRawQuery(db, query);
-    }
-  }
-
-  private static String getFirstWord(String s) {
-    s = s.trim();
-    int firstSpace = s.indexOf(' ');
-    return firstSpace >= 0 ? s.substring(0, firstSpace) : s;
-  }
-
-  private static DatabaseExecuteSqlResponse executeUpdateDelete(SQLiteDatabase database, String query) {
-    SQLiteStatement statement = database.compileStatement(query);
-    int             count     = statement.executeUpdateDelete();
-
-    return DatabaseExecuteSqlResponse.successfulUpdateDelete(count);
-  }
-
-  private static DatabaseExecuteSqlResponse executeInsert(SQLiteDatabase database, String query) {
-    SQLiteStatement statement  = database.compileStatement(query);
-    long            insertedId = statement.executeInsert();
-
-    return DatabaseExecuteSqlResponse.successfulInsert(insertedId);
-  }
-
-  private static DatabaseExecuteSqlResponse executeSelect(SQLiteDatabase database, String query) {
-    try (Cursor cursor = database.rawQuery(query, null)) {
-      String[]           columnNames = cursor.getColumnNames();
-      List<List<Object>> rows        = cursorToList(cursor);
-
-      return DatabaseExecuteSqlResponse.successfulSelect(Arrays.asList(columnNames), rows);
-    }
-  }
-
-  private static DatabaseExecuteSqlResponse executeRawQuery(SQLiteDatabase database, String query) {
-    database.execSQL(query);
-    return DatabaseExecuteSqlResponse.successfulRawQuery();
-  }
-
-  private static @NonNull List<List<Object>> cursorToList(Cursor cursor) {
-    List<List<Object>> rows       = new ArrayList<>();
-    int                numColumns = cursor.getColumnCount();
-
-    while (cursor.moveToNext()) {
-      List<Object> values = new ArrayList<>(numColumns);
-
-      for (int column = 0; column < numColumns; column++) {
-        values.add(getObjectFromColumnIndex(cursor, column));
-      }
-
-      rows.add(values);
-    }
-    return rows;
-  }
-
-  private static @Nullable Object getObjectFromColumnIndex(Cursor cursor, int column) {
-    switch (cursor.getType(column)) {
-      case Cursor.FIELD_TYPE_NULL:
-        return null;
-      case Cursor.FIELD_TYPE_INTEGER:
-        return cursor.getLong(column);
-      case Cursor.FIELD_TYPE_FLOAT:
-        return cursor.getDouble(column);
-      case Cursor.FIELD_TYPE_BLOB:
-        byte[] blob = cursor.getBlob(column);
-        String bytes = blob != null ? "(blob) " + Hex.toStringCondensed(Arrays.copyOf(blob, Math.min(blob.length, 32))) : null;
-        if (bytes != null && bytes.length() == 32 && blob.length > 32) {
-          bytes += "...";
-        }
-        return bytes;
-      case Cursor.FIELD_TYPE_STRING:
-      default:
-        return cursor.getString(column);
-    }
-  }
-
-  static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabaseOpenHelper sqlCipherOpenHelper;
-
-    Descriptor(@NonNull SignalDatabaseOpenHelper sqlCipherOpenHelper) {
-      this.sqlCipherOpenHelper = sqlCipherOpenHelper;
-    }
-
-    @Override
-    public String name() {
-      return sqlCipherOpenHelper.getDatabaseName();
-    }
-
-    public @NonNull SQLiteDatabase getReadable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
-    }
-
-    public @NonNull SQLiteDatabase getWritable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
-    }
-  }
-}

app/src/main/AndroidManifest.xml

@@ -91,6 +91,8 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
 
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
+
     <application android:name=".ApplicationContext"
                  android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
@@ -308,8 +310,6 @@
               android:allowEmbedded="true"
               android:resizeableActivity="true" />
 
-    <activity android:name=".longmessage.LongMessageActivity" />
-
     <activity android:name=".conversation.ConversationPopupActivity"
               android:windowSoftInputMode="stateVisible"
               android:launchMode="singleTask"
@@ -318,12 +318,6 @@
               android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
-    <activity android:name=".messagedetails.MessageDetailsActivity"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Signal.DayNight.NoActionBar" />
-
     <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
@@ -394,6 +388,24 @@
         </intent-filter>
     </activity>
 
+    <activity
+        android:name=".stories.my.MyStoriesActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:theme="@style/Signal.DayNight.NoActionBar"
+        android:windowSoftInputMode="stateAlwaysHidden" />
+
+    <activity
+        android:name=".stories.settings.StorySettingsActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:theme="@style/Signal.DayNight.NoActionBar"
+        android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+
+    <activity
+        android:name=".stories.viewer.StoryViewerActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:theme="@style/TextSecure.DarkNoActionBar"
+        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />
+
         <activity android:name=".components.settings.app.changenumber.ChangeNumberLockActivity"
             android:theme="@style/Signal.DayNight.NoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -636,6 +648,13 @@
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
+    <service android:name=".service.webrtc.AndroidCallConnectionService"
+        android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.telecom.ConnectionService" />
+        </intent-filter>
+    </service>
 
     <service android:name=".components.voice.VoiceNotePlaybackService">
         <intent-filter>

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 
 public final class AppCapabilities {
@@ -19,6 +20,6 @@ public final class AppCapabilities {
    *                       asking if the user has set a Signal PIN or not.
    */
   public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER);
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, FeatureFlags.stories());
   }
 }

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

@@ -52,9 +52,11 @@ public final class AppInitialization {
     Log.i(TAG, "onPostBackupRestore()");
 
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    SignalStore.onPostBackupRestore();
     SignalStore.onFirstEverAppLaunch();
     SignalStore.onboarding().clearAll();
     TextSecurePreferences.onPostBackupRestore(context);
+    TextSecurePreferences.setPasswordDisabled(context, true);
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));

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

@@ -35,30 +35,30 @@ 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.emoji.JumboEmoji;
-import org.thoughtcrime.securesms.jobs.RetrieveReleaseChannelJob;
-import org.thoughtcrime.securesms.mms.SignalGlideModule;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
 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.SignalDatabase;
+import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
+import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
+import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
-import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
+import org.thoughtcrime.securesms.jobs.FontDownloaderJob;
 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;
+import org.thoughtcrime.securesms.jobs.RetrieveReleaseChannelJob;
 import org.thoughtcrime.securesms.jobs.SubscriptionKeepAliveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
@@ -66,6 +66,7 @@ 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.mms.SignalGlideModule;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
@@ -78,6 +79,7 @@ import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
+import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -91,7 +93,6 @@ 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;
@@ -176,7 +177,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
                             .addNonBlocking(this::initializeFcmCheck)
-                            .addNonBlocking(this::initializeSignedPreKeyCheck)
+                            .addNonBlocking(CreateSignedPreKeyJob::enqueueIfNeeded)
                             .addNonBlocking(this::initializePeriodicTasks)
                             .addNonBlocking(this::initializeCircumvention)
                             .addNonBlocking(this::initializePendingMessages)
@@ -188,6 +189,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(EmojiSource::refresh)
                             .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
                             .addNonBlocking(this::ensureProfileUploaded)
+                            .addNonBlocking(() -> ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary())
                             .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
@@ -196,6 +198,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
                             .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
                             .addPostRender(RetrieveReleaseChannelJob::enqueue)
+                            .addPostRender(() -> AndroidTelecomUtil.registerPhoneAccount())
+                            .addPostRender(() -> ApplicationDependencies.getJobManager().add(new FontDownloaderJob()))
+                            .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -352,12 +357,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void initializeSignedPreKeyCheck() {
-    if (!TextSecurePreferences.isSignedPreKeyRegistered(this)) {
-      ApplicationDependencies.getJobManager().add(new CreateSignedPreKeyJob(this));
-    }
-  }
-
   private void initializeExpiringMessageManager() {
     ApplicationDependencies.getExpiringMessageManager().checkSchedule();
   }

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

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
@@ -123,12 +124,12 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
   }
 
   @Override
-  public void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     callback.accept(true);
   }
 
   @Override
-  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {}
+  public void onContactDeselected(@NonNull Optional<RecipientId> recipientId, String number) {}
 
   @Override
   public void onBeginScroll() {

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

@@ -23,6 +23,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -66,6 +67,7 @@ import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.HeaderAction;
 import org.thoughtcrime.securesms.contacts.LetterHeaderDecoration;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
@@ -77,6 +79,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.sharing.ShareContact;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -96,10 +99,9 @@ import java.util.function.Consumer;
  * Fragment for selecting a one or more contacts from a list.
  *
  * @author Moxie Marlinspike
- *
  */
 public final class ContactSelectionListFragment extends LoggingFragment
-                                                implements LoaderManager.LoaderCallbacks<Cursor>
+    implements LoaderManager.LoaderCallbacks<Cursor>
 {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
@@ -138,18 +140,19 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
   private View                                        shadowView;
   private ToolbarShadowAnimationHelper                toolbarShadowAnimationHelper;
-
+  private HeaderActionProvider                        headerActionProvider;
+  private TextView                                    headerActionView;
 
   @Nullable private FixedViewsAdapter headerAdapter;
   @Nullable private FixedViewsAdapter footerAdapter;
   @Nullable private ListCallback      listCallback;
   @Nullable private ScrollCallback    scrollCallback;
-            private GlideRequests     glideRequests;
-            private SelectionLimits   selectionLimit   = SelectionLimits.NO_LIMITS;
-            private Set<RecipientId>  currentSelection;
-            private boolean           isMulti;
-            private boolean           hideCount;
-            private boolean           canSelectSelf;
+  private           GlideRequests     glideRequests;
+  private           SelectionLimits   selectionLimit = SelectionLimits.NO_LIMITS;
+  private           Set<RecipientId>  currentSelection;
+  private           boolean           isMulti;
+  private           boolean           hideCount;
+  private           boolean           canSelectSelf;
 
   @Override
   public void onAttach(@NonNull Context context) {
@@ -190,6 +193,14 @@ public final class ContactSelectionListFragment extends LoggingFragment
     if (getParentFragment() instanceof AbstractContactsCursorLoaderFactoryProvider) {
       cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) getParentFragment();
     }
+
+    if (context instanceof HeaderActionProvider) {
+      headerActionProvider = (HeaderActionProvider) context;
+    }
+
+    if (getParentFragment() instanceof HeaderActionProvider) {
+      headerActionProvider = (HeaderActionProvider) getParentFragment();
+    }
   }
 
   @Override
@@ -243,11 +254,14 @@ public final class ContactSelectionListFragment extends LoggingFragment
     chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
     constraintLayout         = view.findViewById(R.id.container);
     shadowView               = view.findViewById(R.id.toolbar_shadow);
+    headerActionView         = view.findViewById(R.id.header_action);
 
     toolbarShadowAnimationHelper = new ToolbarShadowAnimationHelper(shadowView);
 
+    final LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
+
     recyclerView.addOnScrollListener(toolbarShadowAnimationHelper);
-    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+    recyclerView.setLayoutManager(layoutManager);
     recyclerView.setItemAnimator(new DefaultItemAnimator() {
       @Override
       public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
@@ -285,6 +299,40 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
     currentSelection = getCurrentSelection();
 
+    final HeaderAction headerAction;
+    if (headerActionProvider != null) {
+      headerAction = headerActionProvider.getHeaderAction();
+
+      headerActionView.setEnabled(true);
+      headerActionView.setText(headerAction.getLabel());
+      headerActionView.setCompoundDrawablesRelativeWithIntrinsicBounds(headerAction.getIcon(), 0, 0, 0);
+      headerActionView.setOnClickListener(v -> headerAction.getAction().run());
+      recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+
+        private final Rect bounds = new Rect();
+
+        @Override
+        public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+        }
+
+        @Override
+        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+          if (hideLetterHeaders()) {
+            return;
+          }
+
+          int firstPosition = layoutManager.findFirstVisibleItemPosition();
+          if (firstPosition == 0) {
+            View firstChild = recyclerView.getChildAt(0);
+            recyclerView.getDecoratedBoundsWithMargins(firstChild, bounds);
+            headerActionView.setTranslationY(bounds.top);
+          }
+        }
+      });
+    } else {
+      headerActionView.setEnabled(false);
+    }
+
     return view;
   }
 
@@ -491,12 +539,19 @@ public final class ContactSelectionListFragment extends LoggingFragment
       fastScroller.setRecyclerView(null);
       fastScroller.setVisibility(View.GONE);
     }
+
+    if (headerActionView.isEnabled() && !hasQueryFilter()) {
+      headerActionView.setVisibility(View.VISIBLE);
+    } else {
+      headerActionView.setVisibility(View.GONE);
+    }
   }
 
   @Override
   public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     cursorRecyclerViewAdapter.changeCursor(null);
     fastScroller.setVisibility(View.GONE);
+    headerActionView.setVisibility(View.GONE);
   }
 
   private boolean shouldDisplayRecents() {
@@ -546,6 +601,39 @@ public final class ContactSelectionListFragment extends LoggingFragment
     }.execute();
   }
 
+  /**
+   * Allows the caller to submit a list of recipients to be marked selected. Useful for when a screen needs to load preselected
+   * entries in the background before setting them in the adapter.
+   *
+   * @param contacts List of the contacts to select. This will not overwrite the current selection, but append to it.
+   */
+  public void markSelected(@NonNull Set<ShareContact> contacts) {
+    if (contacts.isEmpty()) {
+      return;
+    }
+
+    Set<SelectedContact> toMarkSelected = contacts.stream()
+                                                  .map(contact -> {
+                                                    if (contact.getRecipientId().isPresent()) {
+                                                      return SelectedContact.forRecipientId(contact.getRecipientId().get());
+                                                    } else {
+                                                      return SelectedContact.forPhone(null, contact.getNumber());
+                                                    }
+                                                  })
+                                                  .filter(c -> !cursorRecyclerViewAdapter.isSelectedContact(c))
+                                                  .collect(java.util.stream.Collectors.toSet());
+
+    if (toMarkSelected.isEmpty()) {
+      return;
+    }
+
+    for (final SelectedContact selectedContact : toMarkSelected) {
+      markContactSelected(selectedContact);
+    }
+
+    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount());
+  }
+
   private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
     @Override
     public void onItemClick(ContactSelectionListItem contact) {
@@ -571,12 +659,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
           SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            return UsernameUtil.fetchAciForUsername(requireContext(), contact.getNumber());
+            return UsernameUtil.fetchAciForUsername(contact.getNumber());
           }, uuid -> {
             loadingDialog.dismiss();
             if (uuid.isPresent()) {
-              Recipient recipient = Recipient.externalUsername(requireContext(), uuid.get(), contact.getNumber());
-              SelectedContact selected = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
+              Recipient       recipient = Recipient.externalUsername(uuid.get(), contact.getNumber());
+              SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
 
               if (onContactSelectedListener != null) {
                 onContactSelectedListener.onBeforeContactSelected(Optional.of(recipient.getId()), null, allowed -> {
@@ -668,7 +756,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
   private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
-                   ()       -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
                    resolved -> addChipForRecipient(resolved, selectedContact));
   }
 
@@ -768,19 +856,25 @@ 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, @Nullable String number, Consumer<Boolean> callback);
-    void onContactDeselected(Optional<RecipientId> recipientId, @Nullable String number);
+    /**
+     * Provides an opportunity to disallow selecting an item. Call the callback with false to disallow, or true to allow it.
+     */
+    void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, @Nullable String number, @NonNull Consumer<Boolean> callback);
+
+    void onContactDeselected(@NonNull Optional<RecipientId> recipientId, @Nullable String number);
+
     void onSelectionChanged();
   }
 
   public interface OnSelectionLimitReachedListener {
     void onSuggestedLimitReached(int limit);
+
     void onHardLimitReached(int limit);
   }
 
   public interface ListCallback {
     void onInvite();
+
     void onNewGroup(boolean forceV1);
   }
 
@@ -788,6 +882,10 @@ public final class ContactSelectionListFragment extends LoggingFragment
     void onBeginScroll();
   }
 
+  public interface HeaderActionProvider {
+    @NonNull HeaderAction getHeaderAction();
+  }
+
   public interface AbstractContactsCursorLoaderFactoryProvider {
     @NonNull AbstractContactsCursorLoader.Factory get();
   }

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

@@ -21,9 +21,11 @@ import androidx.core.content.ContextCompat;
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
+import org.signal.zkgroup.profiles.ProfileKey;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
@@ -186,12 +188,13 @@ public class DeviceActivity extends PassphraseRequiredActivity
             return BAD_CODE;
           }
 
-          ECPublicKey      publicKey         = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
-          IdentityKeyPair  identityKeyPair   = IdentityKeyUtil.getIdentityKeyPair(context);
-          Optional<byte[]> profileKey        = Optional.of(ProfileKeyUtil.getProfileKey(getContext()));
+          ECPublicKey     publicKey          = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
+          IdentityKeyPair aciIdentityKeyPair = SignalStore.account().getAciIdentityKey();
+          IdentityKeyPair pniIdentityKeyPair = SignalStore.account().getPniIdentityKey();
+          ProfileKey      profileKey         = ProfileKeyUtil.getSelfProfileKey();
 
           TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
-          accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, profileKey, verificationCode);
+          accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, verificationCode);
 
           return SUCCESS;
         } catch (NotFoundException e) {

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

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.AnimRes;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
@@ -134,13 +135,13 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   }
 
   @Override
-  public void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     updateSmsButtonText(contactsFragment.getSelectedContacts().size() + 1);
     callback.accept(true);
   }
 
   @Override
-  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
+  public void onContactDeselected(@NonNull Optional<RecipientId> recipientId, String number) {
     updateSmsButtonText(contactsFragment.getSelectedContacts().size());
   }
 

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

@@ -5,19 +5,29 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.Transformations;
+import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.stories.Stories;
+import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
+import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsState;
+import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.WindowUtil;
 
 public class MainActivity extends PassphraseRequiredActivity implements VoiceNoteMediaControllerOwner {
 
@@ -26,13 +36,14 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
   private final MainNavigator navigator    = new MainNavigator(this);
 
-  private VoiceNoteMediaController mediaController;
+  private VoiceNoteMediaController      mediaController;
+  private ConversationListTabsViewModel conversationListTabsViewModel;
 
   public static @NonNull Intent clearTop(@NonNull Context context) {
     Intent intent = new Intent(context, MainActivity.class);
 
     intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                    Intent.FLAG_ACTIVITY_NEW_TASK  |
+                    Intent.FLAG_ACTIVITY_NEW_TASK |
                     Intent.FLAG_ACTIVITY_SINGLE_TOP);
 
     return intent;
@@ -42,9 +53,14 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   protected void onCreate(Bundle savedInstanceState, boolean ready) {
     AppStartup.getInstance().onCriticalRenderEventStart();
     super.onCreate(savedInstanceState, ready);
+
     setContentView(R.layout.main_activity);
 
     mediaController = new VoiceNoteMediaController(this);
+
+    ConversationListTabRepository         repository = new ConversationListTabRepository();
+    ConversationListTabsViewModel.Factory factory    = new ConversationListTabsViewModel.Factory(repository);
+
     navigator.onCreate(savedInstanceState);
 
     handleGroupLinkInIntent(getIntent());
@@ -52,12 +68,27 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     handleSignalMeIntent(getIntent());
 
     CachedInflater.from(this).clear();
+
+    conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
+    Transformations.distinctUntilChanged(Transformations.map(conversationListTabsViewModel.getState(), ConversationListTabsState::getTab))
+                   .observe(this, tab -> {
+                     switch (tab) {
+                       case CHATS:
+                         getSupportFragmentManager().popBackStack();
+                         break;
+                       case STORIES:
+                         navigator.goToStories();
+                         break;
+                     }
+                   });
+
+    updateTabVisibility();
   }
 
   @Override
   public Intent getIntent() {
     return super.getIntent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                                      Intent.FLAG_ACTIVITY_NEW_TASK  |
+                                      Intent.FLAG_ACTIVITY_NEW_TASK |
                                       Intent.FLAG_ACTIVITY_SINGLE_TOP);
   }
 
@@ -82,6 +113,8 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     if (SignalStore.misc().isOldDeviceTransferLocked()) {
       OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
     }
+
+    updateTabVisibility();
   }
 
   @Override
@@ -99,6 +132,17 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     }
   }
 
+  private void updateTabVisibility() {
+    if (Stories.isFeatureEnabled()) {
+      findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE);
+      WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_secondary));
+    } else {
+      findViewById(R.id.conversation_list_tabs).setVisibility(View.GONE);
+      WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_primary));
+      navigator.goToChats();
+    }
+  }
+
   public @NonNull MainNavigator getNavigator() {
     return navigator;
   }

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

@@ -9,7 +9,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
@@ -17,9 +16,12 @@ import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment;
 
 public class MainNavigator {
 
+  public static final String STORIES_TAG = "STORIES";
+
   public static final int REQUEST_CONFIG_CHANGES = 901;
 
   private final MainActivity activity;
@@ -82,6 +84,21 @@ public class MainNavigator {
                         .commit();
   }
 
+  public void goToStories() {
+    if (getFragmentManager().findFragmentByTag(STORIES_TAG) == null) {
+      getFragmentManager().beginTransaction()
+                          .replace(R.id.fragment_container, new StoriesLandingFragment(), STORIES_TAG)
+                          .addToBackStack(null)
+                          .commit();
+    }
+  }
+
+  public void goToChats() {
+    if (getFragmentManager().findFragmentByTag(STORIES_TAG) != null) {
+      getFragmentManager().popBackStack();
+    }
+  }
+
   public void goToGroupCreation() {
     activity.startActivity(CreateGroupActivity.newIntent(activity));
   }

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

@@ -21,13 +21,11 @@ import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -555,19 +553,27 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       }
       cursor = Objects.requireNonNull(data.first);
 
-      int mediaPosition = Objects.requireNonNull(data.second);
-
-      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, cursor, mediaPosition, leftIsRecent);
-      mediaPager.setAdapter(adapter);
-      adapter.setActive(true);
-
       viewModel.setCursor(this, cursor, leftIsRecent);
 
-      int item = restartItem >= 0 ? restartItem : mediaPosition;
-      mediaPager.setCurrentItem(item);
+      int mediaPosition = Objects.requireNonNull(data.second);
 
-      if (item == 0) {
-        viewPagerListener.onPageSelected(0);
+      CursorPagerAdapter oldAdapter = (CursorPagerAdapter) mediaPager.getAdapter();
+      if (oldAdapter == null) {
+        CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(), this, cursor, mediaPosition, leftIsRecent);
+        mediaPager.setAdapter(adapter);
+        adapter.setActive(true);
+      } else {
+        oldAdapter.setCursor(cursor, mediaPosition);
+        oldAdapter.setActive(true);
+      }
+
+      if (oldAdapter == null || restartItem >= 0) {
+        int item = restartItem >= 0 ? restartItem : mediaPosition;
+        mediaPager.setCurrentItem(item);
+
+        if (item == 0) {
+          viewPagerListener.onPageSelected(0);
+        }
       }
     } else {
       mediaNotAvailable();
@@ -715,10 +721,10 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     private final Map<Integer, MediaPreviewFragment> mediaFragments = new HashMap<>();
 
     private final Context context;
-    private final Cursor  cursor;
     private final boolean leftIsRecent;
 
     private boolean active;
+    private Cursor  cursor;
     private int     autoPlayPosition;
 
     CursorPagerAdapter(@NonNull FragmentManager fragmentManager,
@@ -739,6 +745,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       notifyDataSetChanged();
     }
 
+    public void setCursor(@NonNull Cursor cursor, int autoPlayPosition) {
+      this.cursor           = cursor;
+      this.autoPlayPosition = autoPlayPosition;
+    }
+
     @Override
     public int getCount() {
       if (!active) return 0;

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

@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.signal.core.util.logging.Log;
@@ -61,7 +62,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     if (recipientId.isPresent()) {
       launch(Recipient.resolved(recipientId.get()));
     } else {
@@ -75,7 +76,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         SimpleTask.run(getLifecycle(), () -> {
           Recipient resolved = Recipient.external(this, number);
 
-          if (!resolved.isRegistered() || !resolved.hasAci()) {
+          if (!resolved.isRegistered() || !resolved.hasServiceId()) {
             Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.");
             try {
               DirectoryHelper.refreshDirectoryFor(this, resolved, false);

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

@@ -19,9 +19,9 @@ package org.thoughtcrime.securesms;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.VersionTracker;
 
 /**
@@ -61,7 +61,8 @@ public class PassphraseCreateActivity extends PassphraseActivity {
                                                                 passphrase);
 
       MasterSecretUtil.generateAsymmetricMasterSecret(PassphraseCreateActivity.this, masterSecret);
-      IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this);
+      SignalStore.account().generateAciIdentityKey();
+      SignalStore.account().generatePniIdentityKeyIfNecessary();
       VersionTracker.updateLastSeenVersion(PassphraseCreateActivity.this);
 
       return null;

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

@@ -52,7 +52,7 @@ public class AudioRecorder {
                                  .withMimeType(MediaUtil.AUDIO_AAC)
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
 
-        recorder = Build.VERSION.SDK_INT >= 26 && FeatureFlags.voiceNoteRecordingV2() ? new MediaRecorderWrapper() : new AudioCodec();
+        recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
         recorder.start(fds[1]);
       } catch (IOException e) {
         Log.w(TAG, e);

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

@@ -244,4 +244,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
       }
       .execute()
   }
+
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt

@@ -0,0 +1,87 @@
+package org.thoughtcrime.securesms.avatar.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.AvatarImageView
+import org.thoughtcrime.securesms.database.model.StoryViewState
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.stories.Stories
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * AvatarView encapsulating the AvatarImageView and decorations.
+ */
+class AvatarView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null
+) : FrameLayout(context, attrs) {
+
+  init {
+    inflate(context, R.layout.avatar_view, this)
+
+    isClickable = false
+  }
+
+  private val avatar: AvatarImageView = findViewById(R.id.avatar_image_view)
+  private val storyRing: View = findViewById(R.id.avatar_story_ring)
+
+  private fun showStoryRing(hasUnreadStory: Boolean) {
+    if (!Stories.isFeatureEnabled()) {
+      return
+    }
+
+    storyRing.visible = true
+    storyRing.isActivated = hasUnreadStory
+
+    avatar.scaleX = 0.82f
+    avatar.scaleY = 0.82f
+  }
+
+  private fun hideStoryRing() {
+    storyRing.visible = false
+
+    avatar.scaleX = 1f
+    avatar.scaleY = 1f
+  }
+
+  fun setStoryRingFromState(storyViewState: StoryViewState) {
+    when (storyViewState) {
+      StoryViewState.NONE -> hideStoryRing()
+      StoryViewState.UNVIEWED -> showStoryRing(true)
+      StoryViewState.VIEWED -> showStoryRing(false)
+    }
+  }
+
+  /**
+   * Displays Note-to-Self
+   */
+  fun displayChatAvatar(recipient: Recipient) {
+    avatar.setAvatar(recipient)
+  }
+
+  /**
+   * Displays Note-to-Self
+   */
+  fun displayChatAvatar(requestManager: GlideRequests, recipient: Recipient, isQuickContactEnabled: Boolean) {
+    avatar.setAvatar(requestManager, recipient, isQuickContactEnabled)
+  }
+
+  /**
+   * Displays Profile image
+   */
+  fun displayProfileAvatar(recipient: Recipient) {
+    avatar.setRecipient(recipient)
+  }
+
+  fun setFallbackPhotoProvider(fallbackPhotoProvider: Recipient.FallbackPhotoProvider) {
+    avatar.setFallbackPhotoProvider(fallbackPhotoProvider)
+  }
+
+  fun disableQuickContact() {
+    avatar.disableQuickContact()
+  }
+}

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

@@ -182,12 +182,6 @@ public class FullBackupExporter extends FullBackupBase {
         stopwatch.split("table::" + table);
       }
 
-      for (BackupProtos.SharedPreference preference : IdentityKeyUtil.getBackupRecord(context)) {
-        throwIfCanceled(cancellationSignal);
-        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, estimatedCount));
@@ -448,7 +442,12 @@ public class FullBackupExporter extends FullBackupBase {
 
       Class<?> type = dataSet.getType(key);
       if (type == byte[].class) {
-        builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null)));
+        byte[] data = dataSet.getBlob(key, null);
+        if (data != null) {
+          builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null)));
+        } else {
+          Log.w(TAG, "Skipping storing null blob for key: " + key);
+        }
       } else if (type == Boolean.class) {
         builder.setBooleanValue(dataSet.getBoolean(key, false));
       } else if (type == Float.class) {
@@ -458,7 +457,12 @@ public class FullBackupExporter extends FullBackupBase {
       } else if (type == Long.class) {
         builder.setLongValue(dataSet.getLong(key, 0));
       } else if (type == String.class) {
-        builder.setStringValue(dataSet.getString(key, null));
+        String data = dataSet.getString(key, null);
+        if (data != null) {
+          builder.setStringValue(dataSet.getString(key, null));
+        } else {
+          Log.w(TAG, "Skipping storing null string for key: " + key);
+        }
       } else {
         throw new AssertionError("Unknown type: " + type);
       }

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

@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
@@ -250,6 +251,17 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processPreference(@NonNull Context context, SharedPreference preference) {
     SharedPreferences preferences = context.getSharedPreferences(preference.getFile(), 0);
 
+    // Identity keys were moved from shared prefs into SignalStore. Need to handle importing backups made before the migration.
+    if ("SecureSMS-Preferences".equals(preference.getFile())) {
+      if ("pref_identity_public_v3".equals(preference.getKey()) && preference.hasValue()) {
+        SignalStore.account().restoreLegacyIdentityPublicKeyFromBackup(preference.getValue());
+      } else if ("pref_identity_private_v3".equals(preference.getKey()) && preference.hasValue()) {
+        SignalStore.account().restoreLegacyIdentityPrivateKeyFromBackup(preference.getValue());
+      }
+
+      return;
+    }
+
     if (preference.hasValue()) {
       preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
     } else if (preference.hasBooleanValue()) {

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

@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.badges.self.expired
+
+import androidx.core.content.ContextCompat
+import org.thoughtcrime.securesms.R
+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.configure
+import org.thoughtcrime.securesms.components.settings.models.SplashImage
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.CommunicationActions
+
+class CantProcessSubscriptionPaymentBottomSheetDialogFragment : DSLSettingsBottomSheetFragment() {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    SplashImage.register(adapter)
+    adapter.submitList(getConfiguration().toMappingModelList())
+  }
+
+  private fun getConfiguration(): DSLConfiguration {
+    return configure {
+      customPref(SplashImage.Model(R.drawable.ic_card_process))
+
+      sectionHeaderPref(
+        title = DSLSettingsText.from(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__cant_process_subscription_payment, DSLSettingsText.CenterModifier)
+      )
+
+      textPref(
+        summary = DSLSettingsText.from(
+          requireContext().getString(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__were_having_trouble),
+          DSLSettingsText.LearnMoreModifier(ContextCompat.getColor(requireContext(), R.color.signal_accent_primary)) {
+            CommunicationActions.openBrowserLink(requireContext(), requireContext().getString(R.string.donation_decline_code_error_url))
+          },
+          DSLSettingsText.CenterModifier
+        )
+      )
+
+      primaryButton(
+        text = DSLSettingsText.from(android.R.string.ok)
+      ) {
+        dismissAllowingStateLoss()
+      }
+
+      secondaryButtonNoOutline(
+        text = DSLSettingsText.from(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__dont_show_this_again)
+      ) {
+        SignalStore.donationsValues().showCantProcessDialog = false
+      }
+    }
+  }
+}

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

@@ -10,6 +10,7 @@ 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.errors.UnexpectedSubscriptionCancellation
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -27,9 +28,13 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun getConfiguration(): DSLConfiguration {
-    val badge: Badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge
+    val args = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
+    val badge: Badge = args.badge
+    val cancellationReason: UnexpectedSubscriptionCancellation? = UnexpectedSubscriptionCancellation.fromStatus(args.cancelationReason)
     val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
 
+    val inactive = cancellationReason == UnexpectedSubscriptionCancellation.INACTIVE
+
     return configure {
       customPref(ExpiredBadge.Model(badge))
 
@@ -50,8 +55,10 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
         DSLSettingsText.from(
           if (badge.isBoost()) {
             getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired)
+          } else if (inactive) {
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_automatically, badge.name)
           } else {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer, badge.name)
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_canceled)
           },
           DSLSettingsText.CenterModifier
         )
@@ -109,8 +116,8 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
 
   companion object {
     @JvmStatic
-    fun show(badge: Badge, fragmentManager: FragmentManager) {
-      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge).build()
+    fun show(badge: Badge, cancellationReason: UnexpectedSubscriptionCancellation?, fragmentManager: FragmentManager) {
+      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status).build()
       val fragment = ExpiredBadgeBottomSheetDialogFragment()
       fragment.arguments = args.toBundle()
 

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

@@ -38,7 +38,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     Badge.register(adapter) { badge, _, isFaded ->
       if (badge.isExpired() || isFaded) {
-        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge))
+        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge, null))
       } else {
         ViewBadgeBottomSheetDialogFragment.show(parentFragmentManager, Recipient.self().id, badge)
       }

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

@@ -87,7 +87,7 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
   }
 
   @Override
-  public void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     final String displayName = recipientId.transform(id -> Recipient.resolved(id).getDisplayName(this)).or(number);
 
     AlertDialog confirmationDialog = new MaterialAlertDialogBuilder(this)
@@ -116,7 +116,7 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
   }
 
   @Override
-  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
+  public void onContactDeselected(@NonNull Optional<RecipientId> recipientId, String number) {
 
   }
 

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

@@ -1,9 +1,6 @@
 package org.thoughtcrime.securesms.blocked;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.thoughtcrime.securesms.BlockUnblockDialog;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
@@ -74,24 +72,9 @@ public class BlockedUsersFragment extends Fragment {
   }
 
   private void handleRecipientClicked(@NonNull Recipient recipient) {
-    AlertDialog confirmationDialog = new AlertDialog.Builder(requireContext())
-                                                    .setTitle(R.string.BlockedUsersActivity__unblock_user)
-                                                    .setMessage(getString(R.string.BlockedUsersActivity__do_you_want_to_unblock_s, recipient.getDisplayName(requireContext())))
-                                                    .setPositiveButton(R.string.BlockedUsersActivity__unblock, (dialog, which) -> {
-                                                      viewModel.unblock(recipient.getId());
-                                                      dialog.dismiss();
-                                                    })
-                                                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
-                                                      dialog.dismiss();
-                                                    })
-                                                    .setCancelable(true)
-                                                    .create();
-
-    confirmationDialog.setOnShowListener(dialog -> {
-      confirmationDialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Color.RED);
+    BlockUnblockDialog.showUnblockFor(requireContext(), getViewLifecycleOwner().getLifecycle(), recipient, () -> {
+      viewModel.unblock(recipient.getId());
     });
-
-    confirmationDialog.show();
   }
 
   interface Listener {

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

@@ -246,7 +246,7 @@ public class ConversationItemFooter extends ConstraintLayout {
                                });
 
     if (isOutgoing) {
-      dateView.setMaxWidth(ViewUtil.dpToPx(28));
+      dateView.setMaxWidth(ViewUtil.dpToPx(32));
     } else {
       ConstraintSet constraintSet = new ConstraintSet();
       constraintSet.clone(this);

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

@@ -2,8 +2,9 @@ package org.thoughtcrime.securesms.components
 
 import android.app.Dialog
 import android.os.Bundle
+import android.view.ContextThemeWrapper
 import android.view.View
-import androidx.core.content.ContextCompat
+import androidx.annotation.StyleRes
 import androidx.core.view.ViewCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -12,6 +13,7 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 
 /**
@@ -21,9 +23,12 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
 
   protected open val peekHeightPercentage: Float = 0.5f
 
+  @StyleRes
+  protected open val themeResId: Int = R.style.Widget_Signal_FixedRoundedCorners
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setStyle(STYLE_NORMAL, R.style.Widget_Signal_FixedRoundedCorners)
+    setStyle(STYLE_NORMAL, themeResId)
   }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -38,7 +43,8 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
 
     val dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
 
-    dialogBackground.setTint(ContextCompat.getColor(requireContext(), R.color.signal_background_dialog))
+    val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
+    dialogBackground.setTint(ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint))
 
     dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
       override fun onStateChanged(bottomSheet: View, newState: Int) {

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

@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.components
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import org.thoughtcrime.securesms.PassphraseRequiredActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicTheme
+
+/**
+ * Activity that wraps a given fragment
+ */
+abstract class FragmentWrapperActivity : PassphraseRequiredActivity() {
+
+  protected open val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    super.onCreate(savedInstanceState, ready)
+    setContentView(R.layout.fragment_container)
+    dynamicTheme.onCreate(this)
+
+    if (savedInstanceState == null) {
+      supportFragmentManager.beginTransaction()
+        .replace(R.id.fragment_container, getFragment())
+        .commit()
+    }
+  }
+
+  abstract fun getFragment(): Fragment
+
+  override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
+  }
+}

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

@@ -35,7 +35,11 @@ public abstract class FullScreenDialogFragment extends DialogFragment {
     View view = inflater.inflate(R.layout.full_screen_dialog_fragment, container, false);
     inflater.inflate(getDialogLayoutResource(), view.findViewById(R.id.full_screen_dialog_content), true);
     toolbar = view.findViewById(R.id.full_screen_dialog_toolbar);
-    toolbar.setTitle(getTitle());
+
+    if (getTitle() != -1) {
+      toolbar.setTitle(getTitle());
+    }
+
     toolbar.setNavigationOnClickListener(v -> onNavigateUp());
     return view;
   }

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

@@ -79,7 +79,8 @@ public class InputPanel extends LinearLayout
   private ComposeText     composeText;
   private View            quickCameraToggle;
   private View            quickAudioToggle;
-  private View            buttonToggle;
+  private AnimatingToggle buttonToggle;
+  private SendButton      sendButton;
   private View            recordingContainer;
   private View            recordLockCancel;
   private ViewGroup       composeContainer;
@@ -127,6 +128,7 @@ public class InputPanel extends LinearLayout
     this.quickCameraToggle      = findViewById(R.id.quick_camera_toggle);
     this.quickAudioToggle       = findViewById(R.id.quick_audio_toggle);
     this.buttonToggle           = findViewById(R.id.button_toggle);
+    this.sendButton             = findViewById(R.id.send_button);
     this.recordingContainer     = findViewById(R.id.recording_container);
     this.recordLockCancel       = findViewById(R.id.record_cancel);
     this.voiceNoteDraftView     = findViewById(R.id.voice_note_draft_view);
@@ -354,13 +356,13 @@ public class InputPanel extends LinearLayout
     slideToCancel.display();
 
     if (emojiVisible) {
-      ViewUtil.fadeOut(mediaKeyboard, FADE_TIME, View.INVISIBLE);
+      fadeOut(mediaKeyboard);
     }
 
-    ViewUtil.fadeOut(composeText, FADE_TIME, View.INVISIBLE);
-    ViewUtil.fadeOut(quickCameraToggle, FADE_TIME, View.INVISIBLE);
-    ViewUtil.fadeOut(quickAudioToggle, FADE_TIME, View.INVISIBLE);
-    buttonToggle.animate().alpha(0).setDuration(FADE_TIME).start();
+    fadeOut(composeText);
+    fadeOut(quickCameraToggle);
+    fadeOut(quickAudioToggle);
+    fadeOut(buttonToggle);
   }
 
   @Override
@@ -401,7 +403,7 @@ public class InputPanel extends LinearLayout
   public void onRecordLocked() {
     slideToCancel.hide();
     recordLockCancel.setVisibility(View.VISIBLE);
-    buttonToggle.animate().alpha(1).setDuration(FADE_TIME).start();
+    fadeIn(buttonToggle);
     if (listener != null) listener.onRecorderLocked();
   }
 
@@ -475,6 +477,7 @@ public class InputPanel extends LinearLayout
       voiceNoteDraftView.setDraft(voiceNoteDraft);
       voiceNoteDraftView.setVisibility(VISIBLE);
       hideNormalComposeViews();
+      buttonToggle.displayQuick(sendButton);
     } else {
       voiceNoteDraftView.clearDraft();
       ViewUtil.fadeOut(voiceNoteDraftView, FADE_TIME);
@@ -488,36 +491,33 @@ public class InputPanel extends LinearLayout
 
   private void hideNormalComposeViews() {
     if (emojiVisible) {
-      Animation animation = mediaKeyboard.getAnimation();
-      if (animation != null) {
-        animation.cancel();
-      }
-
-      mediaKeyboard.setVisibility(View.INVISIBLE);
+      mediaKeyboard.animate().cancel();
+      mediaKeyboard.setAlpha(0f);
     }
 
-    for (Animation animation : Arrays.asList(composeText.getAnimation(), quickCameraToggle.getAnimation(), quickAudioToggle.getAnimation())) {
-      if (animation != null) {
-        animation.cancel();
-      }
+    for (View view : Arrays.asList(composeText, quickCameraToggle, quickAudioToggle)) {
+      view.animate().cancel();
+      view.setAlpha(0f);
     }
-
-    buttonToggle.animate().cancel();
-
-    composeText.setVisibility(View.INVISIBLE);
-    quickCameraToggle.setVisibility(View.INVISIBLE);
-    quickAudioToggle.setVisibility(View.INVISIBLE);
   }
 
   private void fadeInNormalComposeViews() {
     if (emojiVisible) {
-      ViewUtil.fadeIn(mediaKeyboard, FADE_TIME);
+      fadeIn(mediaKeyboard);
     }
 
-    ViewUtil.fadeIn(composeText, FADE_TIME);
-    ViewUtil.fadeIn(quickCameraToggle, FADE_TIME);
-    ViewUtil.fadeIn(quickAudioToggle, FADE_TIME);
-    buttonToggle.animate().alpha(1).setDuration(FADE_TIME).start();
+    fadeIn(composeText);
+    fadeIn(quickCameraToggle);
+    fadeIn(quickAudioToggle);
+    fadeIn(buttonToggle);
+  }
+
+  private void fadeIn(@NonNull View v) {
+    v.animate().alpha(1).setDuration(FADE_TIME).start();
+  }
+
+  private void fadeOut(@NonNull View v) {
+    v.animate().alpha(0).setDuration(FADE_TIME).start();
   }
 
   private void updateVisibility() {

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

@@ -20,6 +20,8 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
 
   private var hasShown = false
 
+  protected open val withDim: Boolean = false
+
   override fun onCreate(savedInstanceState: Bundle?) {
     setStyle(STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet)
     super.onCreate(savedInstanceState)
@@ -29,7 +31,10 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     val dialog = super.onCreateDialog(savedInstanceState)
 
-    dialog.window?.setDimAmount(0f)
+    if (!withDim) {
+      dialog.window?.setDimAmount(0f)
+    }
+
     dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
 
     return dialog

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

@@ -29,13 +29,17 @@ public class OutlinedThumbnailView extends ThumbnailView {
     cornerMask = new CornerMask(this);
     outliner   = new Outliner();
 
-    outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));
+    int defaultOutlinerColor = ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20);
+    outliner.setColor(defaultOutlinerColor);
 
     int radius = 0;
 
     if (attrs != null) {
       TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.OutlinedThumbnailView, 0, 0);
       radius = typedArray.getDimensionPixelOffset(R.styleable.OutlinedThumbnailView_otv_cornerRadius, 0);
+
+      outliner.setStrokeWidth(typedArray.getDimensionPixelSize(R.styleable.OutlinedThumbnailView_otv_strokeWidth, 1));
+      outliner.setColor(typedArray.getColor(R.styleable.OutlinedThumbnailView_otv_strokeColor, defaultOutlinerColor));
     }
 
     setRadius(radius);

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

@@ -19,7 +19,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 
-import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.signal.core.util.logging.Log;
@@ -45,9 +44,29 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
 
   private static final String TAG = Log.tag(QuoteView.class);
 
-  private static final int MESSAGE_TYPE_PREVIEW  = 0;
-  private static final int MESSAGE_TYPE_OUTGOING = 1;
-  private static final int MESSAGE_TYPE_INCOMING = 2;
+  public enum MessageType {
+    // These codes must match the values for the QuoteView_message_type XML attribute.
+    PREVIEW(0),
+    OUTGOING(1),
+    INCOMING(2),
+    STORY_REPLY(3);
+
+    private final int code;
+
+    MessageType(int code) {
+      this.code = code;
+    }
+
+    private static @NonNull MessageType fromCode(int code) {
+      for (MessageType value : values()) {
+        if (value.code == code) {
+          return value;
+        }
+      }
+
+      throw new IllegalArgumentException("Unsupported code " + code);
+    }
+  }
 
   private ViewGroup mainView;
   private ViewGroup footerView;
@@ -66,11 +85,13 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   private TextView      mediaDescriptionText;
   private TextView      missingLinkText;
   private SlideDeck     attachments;
-  private int           messageType;
+  private MessageType   messageType;
   private int           largeCornerRadius;
   private int           smallCornerRadius;
   private CornerMask    cornerMask;
 
+  private int thumbHeight;
+  private int thumbWidth;
 
   public QuoteView(Context context) {
     super(context);
@@ -112,30 +133,25 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     this.smallCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_bottom);
 
     cornerMask = new CornerMask(this);
-    cornerMask.setRadii(largeCornerRadius, largeCornerRadius, smallCornerRadius, smallCornerRadius);
 
     if (attrs != null) {
       TypedArray typedArray     = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.QuoteView, 0, 0);
       int        primaryColor   = typedArray.getColor(R.styleable.QuoteView_quote_colorPrimary, Color.BLACK);
       int        secondaryColor = typedArray.getColor(R.styleable.QuoteView_quote_colorSecondary, Color.BLACK);
-      messageType = typedArray.getInt(R.styleable.QuoteView_message_type, 0);
+      messageType = MessageType.fromCode(typedArray.getInt(R.styleable.QuoteView_message_type, 0));
       typedArray.recycle();
 
-      dismissView.setVisibility(messageType == MESSAGE_TYPE_PREVIEW ? VISIBLE : GONE);
+      dismissView.setVisibility(messageType == MessageType.PREVIEW ? VISIBLE : GONE);
 
       authorView.setTextColor(primaryColor);
       bodyView.setTextColor(primaryColor);
       attachmentNameView.setTextColor(primaryColor);
       mediaDescriptionText.setTextColor(secondaryColor);
       missingLinkText.setTextColor(primaryColor);
-
-      if (messageType == MESSAGE_TYPE_PREVIEW) {
-        int radius = getResources().getDimensionPixelOffset(R.dimen.quote_corner_radius_preview);
-        cornerMask.setTopLeftRadius(radius);
-        cornerMask.setTopRightRadius(radius);
-      }
     }
 
+    setMessageType(messageType);
+
     dismissView.setOnClickListener(view -> setVisibility(GONE));
   }
 
@@ -151,6 +167,30 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     if (author != null) author.removeForeverObserver(this);
   }
 
+  public void setMessageType(@NonNull MessageType messageType) {
+    this.messageType = messageType;
+
+    cornerMask.setRadii(largeCornerRadius, largeCornerRadius, smallCornerRadius, smallCornerRadius);
+    thumbWidth = thumbHeight = getResources().getDimensionPixelSize(R.dimen.quote_thumb_size);
+
+    if (messageType == MessageType.PREVIEW) {
+      int radius = getResources().getDimensionPixelOffset(R.dimen.quote_corner_radius_preview);
+      cornerMask.setTopLeftRadius(radius);
+      cornerMask.setTopRightRadius(radius);
+    } else if (messageType == MessageType.STORY_REPLY) {
+      thumbWidth = getResources().getDimensionPixelOffset(R.dimen.quote_story_thumb_width);
+      thumbHeight = getResources().getDimensionPixelOffset(R.dimen.quote_story_thumb_height);
+    }
+
+    mainView.setMinimumHeight(thumbHeight);
+
+    ViewGroup.LayoutParams params = thumbnailView.getLayoutParams();
+    params.height = thumbHeight;
+    params.width = thumbWidth;
+
+    thumbnailView.setLayoutParams(params);
+  }
+
   public void setQuote(GlideRequests glideRequests,
                        long id,
                        @NonNull Recipient author,
@@ -172,7 +212,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     setQuoteAttachment(glideRequests, attachments);
     setQuoteMissingFooter(originalMissing);
 
-    if (Build.VERSION.SDK_INT < 21 && messageType == MESSAGE_TYPE_INCOMING && chatColors != null) {
+    if (Build.VERSION.SDK_INT < 21 && messageType == MessageType.INCOMING && chatColors != null) {
       this.setBackgroundColor(chatColors.asSingleColor());
     } else {
       this.setBackground(null);
@@ -208,11 +248,16 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   }
 
   private void setQuoteAuthor(@NonNull Recipient author) {
-    boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
-    boolean preview  = messageType == MESSAGE_TYPE_PREVIEW;
+    boolean outgoing = messageType != MessageType.INCOMING;
+    boolean preview  = messageType == MessageType.PREVIEW || messageType == MessageType.STORY_REPLY;
 
-    authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you)
-                                       : author.getDisplayName(getContext()));
+    if (messageType == MessageType.STORY_REPLY) {
+      authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_your_story)
+                                         : getContext().getString(R.string.QuoteView_s_story, author.getDisplayName(getContext())));
+    } else {
+      authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you)
+                                         : author.getDisplayName(getContext()));
+    }
 
     quoteBarView.setBackgroundColor(ContextCompat.getColor(getContext(), outgoing ? R.color.core_white : android.R.color.transparent));
     mainView.setBackgroundColor(ContextCompat.getColor(getContext(), preview ? R.color.quote_preview_background : R.color.quote_view_background));
@@ -279,7 +324,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       }
       glideRequests.load(new DecryptableUri(imageVideoSlide.getUri()))
                    .centerCrop()
-                   .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
+                   .override(thumbWidth, thumbHeight)
                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                    .into(thumbnailView);
     } else if (documentSlide != null){

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

@@ -16,7 +16,6 @@ import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 
-import kotlin.jvm.functions.Function1;
 import kotlin.jvm.functions.Function2;
 
 /**
@@ -121,7 +120,11 @@ public final class RotatableGradientDrawable extends Drawable {
   public void draw(Canvas canvas) {
     int save = canvas.save();
     canvas.rotate(degrees, getBounds().width() / 2f, getBounds().height() / 2f);
-    canvas.drawRect(fillRect, fillPaint);
+
+    int height = fillRect.height();
+    int width = fillRect.width();
+    canvas.drawRect(fillRect.left - width, fillRect.top - height, fillRect.right + width, fillRect.bottom + height, fillPaint);
+
     canvas.restoreToCount(save);
   }
 

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

@@ -5,10 +5,6 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
-import android.graphics.drawable.shapes.Shape;
 import android.net.Uri;
 import android.os.Build;
 import android.util.AttributeSet;
@@ -19,7 +15,6 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
-import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -33,7 +28,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackPolicy;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -45,11 +39,8 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.thoughtcrime.securesms.util.views.Stub;
-import org.thoughtcrime.securesms.video.VideoPlayer;
 import org.whispersystems.libsignal.util.guava.Optional;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Objects;

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

@@ -1,26 +1,39 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 
 import org.thoughtcrime.securesms.R;
 
 public class EmojiImageView extends AppCompatImageView {
+
+  private final boolean forceJumboEmoji;
+
   public EmojiImageView(Context context) {
-    super(context);
+    this(context, null);
   }
 
   public EmojiImageView(Context context, AttributeSet attrs) {
-    super(context, attrs);
+    this(context, attrs, 0);
+  }
+
+  public EmojiImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.EmojiImageView, 0, 0);
+    forceJumboEmoji = a.getBoolean(R.styleable.EmojiImageView_forceJumbo, false);
+    a.recycle();
   }
 
   public void setImageEmoji(CharSequence emoji) {
     if (isInEditMode()) {
       setImageResource(R.drawable.ic_emoji);
     } else {
-      setImageDrawable(EmojiProvider.getEmojiDrawable(getContext(), emoji));
+      setImageDrawable(EmojiProvider.getEmojiDrawable(getContext(), emoji, forceJumboEmoji));
     }
   }
 }

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

@@ -13,7 +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.text.style.CharacterStyle;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.ViewGroup;
@@ -186,16 +186,16 @@ 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.
+   * Starting from API 30, there can be a rounding error in text layout when a non-zero letter
+   * spacing 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) {
+    if (Build.VERSION.SDK_INT >= 30 && getLetterSpacing() > 0) {
       CharSequence text = getText();
       if (text != null) {
         int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
@@ -218,7 +218,7 @@ public class EmojiTextView extends AppCompatTextView {
       return false;
     }
 
-    return ((Spanned) text).nextSpanTransition(-1, text.length(), MetricAffectingSpan.class) != text.length();
+    return ((Spanned) text).nextSpanTransition(-1, text.length(), CharacterStyle.class) != text.length();
   }
 
   public int getLastLineWidth() {
@@ -283,7 +283,8 @@ public class EmojiTextView extends AppCompatTextView {
       int lineCount = getLineCount();
       if (lineCount > maxLines) {
         int          overflowStart = getLayout().getLineStart(maxLines - 1);
-        CharSequence overflow      = getText().subSequence(overflowStart, getText().length());
+        int          overflowEnd   = getLayout().getLineEnd(maxLines - 1);
+        CharSequence overflow      = getText().subSequence(overflowStart, overflowEnd);
         float        adjust        = overflowText != null ? getPaint().measureText(overflowText, 0, overflowText.length()) : 0f;
         CharSequence ellipsized    = TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END);
 
@@ -302,7 +303,7 @@ public class EmojiTextView extends AppCompatTextView {
     if (getLayout() != null) {
       ellipsize.run();
     } else {
-      ViewKt.doOnNextLayout(this, view -> {
+      ViewKt.doOnPreDraw(this, view -> {
         ellipsize.run();
         return Unit.INSTANCE;
       });

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

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -9,6 +10,8 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.TypedArrayUtils;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -20,8 +23,8 @@ import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
 import org.thoughtcrime.securesms.keyboard.KeyboardPage;
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerFragment;
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment;
-
-import java.util.Objects;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ThemedFragment;
 
 public class MediaKeyboard extends FrameLayout implements InputView {
 
@@ -34,6 +37,7 @@ public class MediaKeyboard extends FrameLayout implements InputView {
             private State                 keyboardState;
             private KeyboardPagerFragment keyboardPagerFragment;
             private FragmentManager       fragmentManager;
+            private int                   mediaKeyboardTheme;
 
   public MediaKeyboard(Context context) {
     this(context, null);
@@ -41,6 +45,12 @@ public class MediaKeyboard extends FrameLayout implements InputView {
 
   public MediaKeyboard(Context context, AttributeSet attrs) {
     super(context, attrs);
+
+    if (attrs != null) {
+      TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.MediaKeyboard);
+      mediaKeyboardTheme = array.getResourceId(R.styleable.MediaKeyboard_media_keyboard_theme, -1);
+      array.recycle();
+    }
   }
 
   public void setFragmentManager(@NonNull FragmentManager fragmentManager) {
@@ -70,6 +80,10 @@ public class MediaKeyboard extends FrameLayout implements InputView {
     show();
   }
 
+  public boolean isInitialised() {
+    return isInitialised;
+  }
+
   public void show() {
     if (!isInitialised) initView();
 
@@ -122,9 +136,14 @@ public class MediaKeyboard extends FrameLayout implements InputView {
 
     keyboardState = State.EMOJI_SEARCH;
 
+    EmojiSearchFragment emojiSearchFragment = new EmojiSearchFragment();
+    if (mediaKeyboardTheme != -1) {
+      ThemedFragment.withTheme(emojiSearchFragment, mediaKeyboardTheme);
+    }
+
     fragmentManager.beginTransaction()
                    .hide(keyboardPagerFragment)
-                   .add(R.id.media_keyboard_fragment_container, new EmojiSearchFragment(), EMOJI_SEARCH)
+                   .add(R.id.media_keyboard_fragment_container, emojiSearchFragment, EMOJI_SEARCH)
                    .runOnCommit(() -> show(latestKeyboardHeight, true))
                    .setCustomAnimations(R.anim.fade_in, R.anim.fade_out)
                    .commitAllowingStateLoss();
@@ -141,6 +160,10 @@ public class MediaKeyboard extends FrameLayout implements InputView {
       }
 
       keyboardPagerFragment = new KeyboardPagerFragment();
+      if (mediaKeyboardTheme != -1) {
+        ThemedFragment.withTheme(keyboardPagerFragment, mediaKeyboardTheme);
+      }
+
       fragmentManager.beginTransaction()
                      .replace(R.id.media_keyboard_fragment_container, keyboardPagerFragment)
                      .commitNowAllowingStateLoss();

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

@@ -9,7 +9,7 @@ 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.crypto.storage.SignalIdentityKeyStore;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
@@ -40,7 +40,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn
 
   @Override
   public void onClick(DialogInterface dialog, int which) {
-    final TextSecureIdentityKeyStore identityStore = ApplicationDependencies.getProtocolStore().aci().identities();
+    final SignalIdentityKeyStore identityStore = ApplicationDependencies.getProtocolStore().aci().identities();
 
     SimpleTask.run(() -> {
       try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {

app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Segment.kt

@@ -0,0 +1,52 @@
+/*
+MIT License
+
+Copyright (c) 2020 Tiago Ornelas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+package org.thoughtcrime.securesms.components.segmentedprogressbar
+
+/**
+ * Created by Tiago Ornelas on 18/04/2020.
+ * Model that holds the segment state
+ */
+class Segment(val animationDurationMillis: Long) {
+
+  var animationProgressPercentage: Float = 0f
+
+  var animationState: AnimationState = AnimationState.IDLE
+    set(value) {
+      animationProgressPercentage = when (value) {
+        AnimationState.ANIMATED -> 1f
+        AnimationState.IDLE -> 0f
+        else -> animationProgressPercentage
+      }
+      field = value
+    }
+
+  /**
+   * Represents possible drawing states of the segment
+   */
+  enum class AnimationState {
+    ANIMATED,
+    ANIMATING,
+    IDLE
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentState.kt

@@ -0,0 +1,6 @@
+package org.thoughtcrime.securesms.components.segmentedprogressbar
+
+data class SegmentState(
+  val position: Long,
+  val duration: Long
+)

app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt

@@ -0,0 +1,416 @@
+/*
+MIT License
+
+Copyright (c) 2020 Tiago Ornelas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+package org.thoughtcrime.securesms.components.segmentedprogressbar
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Path
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import androidx.viewpager.widget.ViewPager
+import org.thoughtcrime.securesms.R
+import java.util.concurrent.TimeUnit
+
+/**
+ * Created by Tiago Ornelas on 18/04/2020.
+ * Represents a segmented progress bar on which, the progress is set by segments
+ * @see Segment
+ * And the progress of each segment is animated based on a set speed
+ */
+class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchListener {
+
+  companion object {
+    /**
+     * It is common now for devices to run at 60FPS
+     */
+    val MILLIS_PER_FRAME = TimeUnit.MILLISECONDS.toMillis(17)
+  }
+
+  private val path = Path()
+  private val corners = floatArrayOf(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f)
+
+  /**
+   * Number of total segments to draw
+   */
+  var segmentCount: Int = resources.getInteger(R.integer.segmentedprogressbar_default_segments_count)
+    set(value) {
+      field = value
+      this.initSegments()
+    }
+
+  /**
+   * Mapping of segment index -> duration in millis. Negative durations
+   * ARE valid but they'll result in a call to SegmentedProgressBarListener#onRequestSegmentProgressPercentage
+   * which should return the current % position for the currently playing item. This helps
+   * to avoid synchronizing the seek bar to playback.
+   */
+  var segmentDurations: Map<Int, Long> = mapOf()
+    set(value) {
+      field = value
+      this.initSegments()
+    }
+
+  var margin: Int = resources.getDimensionPixelSize(R.dimen.segmentedprogressbar_default_segment_margin)
+    private set
+  var radius: Int = resources.getDimensionPixelSize(R.dimen.segmentedprogressbar_default_corner_radius)
+    private set
+  var segmentStrokeWidth: Int =
+    resources.getDimensionPixelSize(R.dimen.segmentedprogressbar_default_segment_stroke_width)
+    private set
+
+  var segmentBackgroundColor: Int = Color.WHITE
+    private set
+  var segmentSelectedBackgroundColor: Int =
+    context.getThemeColor(R.attr.colorAccent)
+    private set
+  var segmentStrokeColor: Int = Color.BLACK
+    private set
+  var segmentSelectedStrokeColor: Int = Color.BLACK
+    private set
+
+  var timePerSegmentMs: Long =
+    resources.getInteger(R.integer.segmentedprogressbar_default_time_per_segment_ms).toLong()
+    private set
+
+  private var segments = mutableListOf<Segment>()
+  private val selectedSegment: Segment?
+    get() = segments.firstOrNull { it.animationState == Segment.AnimationState.ANIMATING }
+  private val selectedSegmentIndex: Int
+    get() = segments.indexOf(this.selectedSegment)
+
+  // Drawing
+  val strokeApplicable: Boolean
+    get() = segmentStrokeWidth * 4 <= measuredHeight
+
+  val segmentWidth: Float
+    get() = (measuredWidth - margin * (segmentCount - 1)).toFloat() / segmentCount
+
+  var viewPager: ViewPager? = null
+    @SuppressLint("ClickableViewAccessibility")
+    set(value) {
+      field = value
+      if (value == null) {
+        viewPager?.removeOnPageChangeListener(this)
+        viewPager?.setOnTouchListener(null)
+      } else {
+        viewPager?.addOnPageChangeListener(this)
+        viewPager?.setOnTouchListener(this)
+      }
+    }
+
+  /**
+   * Sets callbacks for progress bar state changes
+   * @see SegmentedProgressBarListener
+   */
+  var listener: SegmentedProgressBarListener? = null
+
+  private var lastFrameTimeMillis: Long = 0L
+
+  constructor(context: Context) : super(context)
+
+  constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+
+    val typedArray =
+      context.theme.obtainStyledAttributes(attrs, R.styleable.SegmentedProgressBar, 0, 0)
+
+    segmentCount =
+      typedArray.getInt(R.styleable.SegmentedProgressBar_totalSegments, segmentCount)
+
+    margin =
+      typedArray.getDimensionPixelSize(
+        R.styleable.SegmentedProgressBar_segmentMargins,
+        margin
+      )
+    radius =
+      typedArray.getDimensionPixelSize(
+        R.styleable.SegmentedProgressBar_segmentCornerRadius,
+        radius
+      )
+    segmentStrokeWidth =
+      typedArray.getDimensionPixelSize(
+        R.styleable.SegmentedProgressBar_segmentStrokeWidth,
+        segmentStrokeWidth
+      )
+
+    segmentBackgroundColor =
+      typedArray.getColor(
+        R.styleable.SegmentedProgressBar_segmentBackgroundColor,
+        segmentBackgroundColor
+      )
+    segmentSelectedBackgroundColor =
+      typedArray.getColor(
+        R.styleable.SegmentedProgressBar_segmentSelectedBackgroundColor,
+        segmentSelectedBackgroundColor
+      )
+
+    segmentStrokeColor =
+      typedArray.getColor(
+        R.styleable.SegmentedProgressBar_segmentStrokeColor,
+        segmentStrokeColor
+      )
+    segmentSelectedStrokeColor =
+      typedArray.getColor(
+        R.styleable.SegmentedProgressBar_segmentSelectedStrokeColor,
+        segmentSelectedStrokeColor
+      )
+
+    timePerSegmentMs =
+      typedArray.getInt(
+        R.styleable.SegmentedProgressBar_timePerSegment,
+        timePerSegmentMs.toInt()
+      ).toLong()
+
+    typedArray.recycle()
+  }
+
+  constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+    context,
+    attrs,
+    defStyleAttr
+  )
+
+  init {
+    setLayerType(LAYER_TYPE_SOFTWARE, null)
+  }
+
+  override fun onDraw(canvas: Canvas?) {
+    super.onDraw(canvas)
+
+    segments.forEachIndexed { index, segment ->
+      val drawingComponents = getDrawingComponents(segment, index)
+
+      when (index) {
+        0 -> {
+          corners.indices.forEach { corners[it] = 0f }
+          corners[0] = radius.toFloat()
+          corners[1] = radius.toFloat()
+          corners[6] = radius.toFloat()
+          corners[7] = radius.toFloat()
+        }
+        segments.lastIndex -> {
+          corners.indices.forEach { corners[it] = 0f }
+          corners[2] = radius.toFloat()
+          corners[3] = radius.toFloat()
+          corners[4] = radius.toFloat()
+          corners[5] = radius.toFloat()
+        }
+      }
+
+      drawingComponents.first.forEachIndexed { drawingIndex, rectangle ->
+        when (index) {
+          0, segments.lastIndex -> {
+            path.reset()
+            path.addRoundRect(rectangle, corners, Path.Direction.CW)
+            canvas?.drawPath(path, drawingComponents.second[drawingIndex])
+          }
+          else -> canvas?.drawRect(
+            rectangle,
+            drawingComponents.second[drawingIndex]
+          )
+        }
+      }
+    }
+
+    onFrame(System.currentTimeMillis())
+  }
+
+  /**
+   * Start/Resume progress animation
+   */
+  fun start() {
+    pause()
+    val segment = selectedSegment
+    if (segment == null) {
+      next()
+    } else {
+      isPaused = false
+      invalidate()
+    }
+  }
+
+  /**
+   * Pauses the animation process
+   */
+  fun pause() {
+    isPaused = true
+    lastFrameTimeMillis = 0L
+  }
+
+  /**
+   * Resets the whole animation state and selected segments
+   * !Doesn't restart it!
+   * To restart, call the start() method
+   */
+  fun reset() {
+    this.segments.map { it.animationState = Segment.AnimationState.IDLE }
+    this.invalidate()
+  }
+
+  /**
+   * Starts animation for the following segment
+   */
+  fun next() {
+    loadSegment(offset = 1, userAction = true)
+  }
+
+  /**
+   * Starts animation for the previous segment
+   */
+  fun previous() {
+    loadSegment(offset = -1, userAction = true)
+  }
+
+  /**
+   * Restarts animation for the current segment
+   */
+  fun restartSegment() {
+    loadSegment(offset = 0, userAction = true)
+  }
+
+  /**
+   * Skips a number of segments
+   * @param offset number o segments fo skip
+   */
+  fun skip(offset: Int) {
+    loadSegment(offset = offset, userAction = true)
+  }
+
+  /**
+   * Sets current segment to the
+   * @param position index
+   */
+  fun setPosition(position: Int) {
+    loadSegment(offset = position - this.selectedSegmentIndex, userAction = true)
+  }
+
+  // Private methods
+  private fun loadSegment(offset: Int, userAction: Boolean) {
+    val oldSegmentIndex = this.segments.indexOf(this.selectedSegment)
+
+    val nextSegmentIndex = oldSegmentIndex + offset
+
+    // Index out of bounds, ignore operation
+    if (userAction && nextSegmentIndex !in 0 until segmentCount) {
+      if (nextSegmentIndex >= segmentCount) {
+        this.listener?.onFinished()
+      } else {
+        restartSegment()
+      }
+      return
+    }
+
+    segments.mapIndexed { index, segment ->
+      if (offset > 0) {
+        if (index < nextSegmentIndex) segment.animationState =
+          Segment.AnimationState.ANIMATED
+      } else if (offset < 0) {
+        if (index > nextSegmentIndex - 1) segment.animationState =
+          Segment.AnimationState.IDLE
+      } else if (offset == 0) {
+        if (index == nextSegmentIndex) segment.animationState = Segment.AnimationState.IDLE
+      }
+    }
+
+    val nextSegment = this.segments.getOrNull(nextSegmentIndex)
+
+    // Handle next segment transition/ending
+    if (nextSegment != null) {
+      pause()
+      nextSegment.animationState = Segment.AnimationState.ANIMATING
+      isPaused = false
+      invalidate()
+      this.listener?.onPage(oldSegmentIndex, this.selectedSegmentIndex)
+      viewPager?.currentItem = this.selectedSegmentIndex
+    } else {
+      pause()
+      this.listener?.onFinished()
+    }
+  }
+
+  private fun getSegmentProgressPercentage(segment: Segment, timeSinceLastFrameMillis: Long): Float {
+    return if (segment.animationDurationMillis > 0) {
+      segment.animationProgressPercentage + timeSinceLastFrameMillis.toFloat() / segment.animationDurationMillis
+    } else {
+      listener?.onRequestSegmentProgressPercentage() ?: 0f
+    }
+  }
+
+  private fun initSegments() {
+    this.segments.clear()
+    segments.addAll(
+      List(segmentCount) {
+        val duration = segmentDurations[it] ?: timePerSegmentMs
+        Segment(duration)
+      }
+    )
+    this.invalidate()
+    reset()
+  }
+
+  private var isPaused = true
+
+  private fun onFrame(frameTimeMillis: Long) {
+    if (isPaused) {
+      return
+    }
+
+    val lastFrameTimeMillis = this.lastFrameTimeMillis
+
+    this.lastFrameTimeMillis = frameTimeMillis
+
+    val selectedSegment = this.selectedSegment
+    if (selectedSegment == null) {
+      loadSegment(offset = 1, userAction = false)
+    } else if (lastFrameTimeMillis > 0L) {
+      val segmentProgressPercentage = getSegmentProgressPercentage(selectedSegment, frameTimeMillis - lastFrameTimeMillis)
+      selectedSegment.animationProgressPercentage = segmentProgressPercentage
+      if (selectedSegment.animationProgressPercentage >= 1f) {
+        loadSegment(offset = 1, userAction = false)
+      } else {
+        this.invalidate()
+      }
+    } else {
+      this.invalidate()
+    }
+  }
+
+  override fun onPageScrollStateChanged(state: Int) {}
+
+  override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+
+  override fun onPageSelected(position: Int) {
+    this.setPosition(position)
+  }
+
+  override fun onTouch(p0: View?, p1: MotionEvent?): Boolean {
+    when (p1?.action) {
+      MotionEvent.ACTION_DOWN -> pause()
+      MotionEvent.ACTION_UP -> start()
+    }
+    return false
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBarListener.kt

@@ -0,0 +1,42 @@
+/*
+MIT License
+
+Copyright (c) 2020 Tiago Ornelas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+package org.thoughtcrime.securesms.components.segmentedprogressbar
+
+/**
+ * Created by Tiago Ornelas on 18/04/2020.
+ * Interface to communicate progress events
+ */
+interface SegmentedProgressBarListener {
+  /**
+   * Notifies when selected segment changed
+   */
+  fun onPage(oldPageIndex: Int, newPageIndex: Int)
+
+  /**
+   * Notifies when last segment finished animating
+   */
+  fun onFinished()
+
+  fun onRequestSegmentProgressPercentage(): Float?
+}

app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/Utils.kt

@@ -0,0 +1,95 @@
+/*
+MIT License
+
+Copyright (c) 2020 Tiago Ornelas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+package org.thoughtcrime.securesms.components.segmentedprogressbar
+
+import android.content.Context
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.TypedValue
+
+fun Context.getThemeColor(attributeColor: Int): Int {
+  val typedValue = TypedValue()
+  this.theme.resolveAttribute(attributeColor, typedValue, true)
+  return typedValue.data
+}
+
+fun SegmentedProgressBar.getDrawingComponents(
+  segment: Segment,
+  segmentIndex: Int
+): Pair<MutableList<RectF>, MutableList<Paint>> {
+
+  val rectangles = mutableListOf<RectF>()
+  val paints = mutableListOf<Paint>()
+  val segmentWidth = segmentWidth
+  val startBound = segmentIndex * segmentWidth + ((segmentIndex) * margin)
+  val endBound = startBound + segmentWidth
+  val stroke = if (!strokeApplicable) 0f else this.segmentStrokeWidth.toFloat()
+
+  val backgroundPaint = Paint().apply {
+    style = Paint.Style.FILL
+    color = segmentBackgroundColor
+  }
+
+  val selectedBackgroundPaint = Paint().apply {
+    style = Paint.Style.FILL
+    color = segmentSelectedBackgroundColor
+  }
+
+  val strokePaint = Paint().apply {
+    color =
+      if (segment.animationState == Segment.AnimationState.IDLE) segmentStrokeColor else segmentSelectedStrokeColor
+    style = Paint.Style.STROKE
+    strokeWidth = stroke
+  }
+
+  // Background component
+  if (segment.animationState == Segment.AnimationState.ANIMATED) {
+    rectangles.add(RectF(startBound + stroke, height - stroke, endBound - stroke, stroke))
+    paints.add(selectedBackgroundPaint)
+  } else {
+    rectangles.add(RectF(startBound + stroke, height - stroke, endBound - stroke, stroke))
+    paints.add(backgroundPaint)
+  }
+
+  // Progress component
+  if (segment.animationState == Segment.AnimationState.ANIMATING) {
+    rectangles.add(
+      RectF(
+        startBound + stroke,
+        height - stroke,
+        startBound + segment.animationProgressPercentage * segmentWidth,
+        stroke
+      )
+    )
+    paints.add(selectedBackgroundPaint)
+  }
+
+  // Stroke component
+  if (stroke > 0) {
+    rectangles.add(RectF(startBound + stroke, height - stroke, endBound - stroke, stroke))
+    paints.add(strokePaint)
+  }
+
+  return Pair(rectangles, paints)
+}

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

@@ -22,38 +22,47 @@ abstract class DSLSettingsFragment(
   @StringRes private val titleId: Int = -1,
   @MenuRes private val menuId: Int = -1,
   @LayoutRes layoutId: Int = R.layout.dsl_settings_fragment,
-  val layoutManagerProducer: (Context) -> RecyclerView.LayoutManager = { context -> LinearLayoutManager(context) }
+  protected var layoutManagerProducer: (Context) -> RecyclerView.LayoutManager = { context -> LinearLayoutManager(context) }
 ) : Fragment(layoutId) {
 
-  private var recyclerView: RecyclerView? = null
+  protected var recyclerView: RecyclerView? = null
+    private set
+
   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)
+    val toolbar: Toolbar? = view.findViewById(R.id.toolbar)
+    val toolbarShadow: View? = view.findViewById(R.id.toolbar_shadow)
 
     if (titleId != -1) {
-      toolbar.setTitle(titleId)
+      toolbar?.setTitle(titleId)
     }
 
-    toolbar.setNavigationOnClickListener {
+    toolbar?.setNavigationOnClickListener {
       requireActivity().onBackPressed()
     }
 
     if (menuId != -1) {
-      toolbar.inflateMenu(menuId)
-      toolbar.setOnMenuItemClickListener { onOptionsItemSelected(it) }
+      toolbar?.inflateMenu(menuId)
+      toolbar?.setOnMenuItemClickListener { onOptionsItemSelected(it) }
+    }
+
+    if (toolbarShadow != null) {
+      scrollAnimationHelper = getOnScrollAnimationHelper(toolbarShadow)
     }
 
-    scrollAnimationHelper = getOnScrollAnimationHelper(toolbarShadow)
     val settingsAdapter = DSLSettingsAdapter()
 
     recyclerView = view.findViewById<RecyclerView>(R.id.recycler).apply {
       edgeEffectFactory = EdgeEffectFactory()
       layoutManager = layoutManagerProducer(requireContext())
       adapter = settingsAdapter
-      addOnScrollListener(scrollAnimationHelper!!)
+
+      val helper = scrollAnimationHelper
+      if (helper != null) {
+        addOnScrollListener(helper)
+      }
     }
 
     bindAdapter(settingsAdapter)

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

@@ -4,8 +4,11 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
+import android.graphics.drawable.InsetDrawable
+import android.graphics.drawable.LayerDrawable
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.Px
 import androidx.core.content.ContextCompat
 import org.thoughtcrime.securesms.R
 
@@ -24,6 +27,23 @@ sealed class DSLSettingsIcon {
     }
   }
 
+  private data class FromResourceWithBackground(
+    @DrawableRes private val iconId: Int,
+    @ColorRes private val iconTintId: Int,
+    @DrawableRes private val backgroundId: Int,
+    @ColorRes private val backgroundTint: Int,
+    @Px private val insetPx: Int,
+  ) : DSLSettingsIcon() {
+    override fun resolve(context: Context): Drawable {
+      return LayerDrawable(
+        arrayOf(
+          FromResource(backgroundId, backgroundTint).resolve(context),
+          InsetDrawable(FromResource(iconId, iconTintId).resolve(context), insetPx, insetPx, insetPx, insetPx)
+        )
+      )
+    }
+  }
+
   private data class FromDrawable(
     private val drawable: Drawable
   ) : DSLSettingsIcon() {
@@ -33,6 +53,17 @@ sealed class DSLSettingsIcon {
   abstract fun resolve(context: Context): Drawable
 
   companion object {
+    @JvmStatic
+    fun from(
+      @DrawableRes iconId: Int,
+      @ColorRes iconTintId: Int,
+      @DrawableRes backgroundId: Int,
+      @ColorRes backgroundTint: Int,
+      @Px insetPx: Int = 0
+    ): DSLSettingsIcon {
+      return FromResourceWithBackground(iconId, iconTintId, backgroundId, backgroundTint, insetPx)
+    }
+
     @JvmStatic
     fun from(@DrawableRes iconId: Int, @ColorRes iconTintId: Int = R.color.signal_icon_tint_primary): DSLSettingsIcon = FromResource(iconId, iconTintId)
 

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

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.settings
 
 import android.content.Context
+import android.text.SpannableStringBuilder
 import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
@@ -81,4 +82,17 @@ sealed class DSLSettingsText {
       return SpanUtil.bold(charSequence)
     }
   }
+
+  class LearnMoreModifier(
+    @ColorInt private val learnMoreColor: Int,
+    val onClick: () -> Unit
+  ) : Modifier {
+    override fun modify(context: Context, charSequence: CharSequence): CharSequence {
+      return SpannableStringBuilder(charSequence).append(" ").append(
+        SpanUtil.learnMore(context, learnMoreColor) {
+          onClick()
+        }
+      )
+    }
+  }
 }

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

@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.lock.v2.KbsConstants
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
 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
@@ -107,7 +106,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
 
       sectionHeaderPref(R.string.AccountSettingsFragment__account)
 
-      if (FeatureFlags.changeNumber() && Recipient.self().changeNumberCapability == Recipient.Capability.SUPPORTED) {
+      if (Recipient.self().changeNumberCapability == Recipient.Capability.SUPPORTED && SignalStore.account().isRegistered) {
         clickPref(
           title = DSLSettingsText.from(R.string.AccountSettingsFragment__change_phone_number),
           onClick = {

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

@@ -5,6 +5,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
+import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -30,4 +31,12 @@ class ChatsSettingsRepository {
       )
     }
   }
+
+  fun syncPreferSystemContactPhotos() {
+    SignalExecutors.BOUNDED.execute {
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+      ApplicationDependencies.getJobManager().add(MultiDeviceContactUpdateJob(true))
+      StorageSyncHelper.scheduleSyncForDataChange()
+    }
+  }
 }

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

@@ -4,9 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.ThrottledDebouncer
@@ -36,10 +34,9 @@ class ChatsSettingsViewModel(private val repository: ChatsSettingsRepository) :
 
   fun setUseAddressBook(enabled: Boolean) {
     store.update { it.copy(useAddressBook = enabled) }
-    SignalStore.settings().isPreferSystemContactPhotos = enabled
     refreshDebouncer.publish { ConversationUtil.refreshRecipientShortcuts() }
-    ApplicationDependencies.getJobManager().add(MultiDeviceContactUpdateJob(true))
-    StorageSyncHelper.scheduleSyncForDataChange()
+    SignalStore.settings().isPreferSystemContactPhotos = enabled
+    repository.syncPreferSystemContactPhotos()
   }
 
   fun setUseSystemEmoji(enabled: Boolean) {

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

@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
 import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob
+import org.thoughtcrime.securesms.jobs.RetrieveReleaseChannelJob
 import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob
 import org.thoughtcrime.securesms.jobs.StorageForcePushJob
 import org.thoughtcrime.securesms.jobs.SubscriptionReceiptRequestResponseJob
@@ -31,6 +32,7 @@ import org.thoughtcrime.securesms.payments.DataExportUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask
+import kotlin.math.max
 
 class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__internal_preferences) {
 
@@ -196,11 +198,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       sectionHeaderPref(R.string.preferences__internal_network)
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_force_censorship),
-        summary = DSLSettingsText.from(R.string.preferences__internal_force_censorship_description),
-        isChecked = state.forceCensorship,
+        title = DSLSettingsText.from(R.string.preferences__internal_allow_censorship_toggle),
+        summary = DSLSettingsText.from(R.string.preferences__internal_allow_censorship_toggle_description),
+        isChecked = state.allowCensorshipSetting,
         onClick = {
-          viewModel.setForceCensorship(!state.forceCensorship)
+          viewModel.setAllowCensorshipSetting(!state.allowCensorshipSetting)
         }
       )
 
@@ -333,9 +335,9 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         }
       )
 
-      dividerPref()
-
       if (FeatureFlags.donorBadges() && SignalStore.donationsValues().getSubscriber() != null) {
+        dividerPref()
+
         sectionHeaderPref(R.string.preferences__internal_badges)
 
         clickPref(
@@ -345,6 +347,43 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
           }
         )
       }
+
+      dividerPref()
+
+      sectionHeaderPref(R.string.preferences__internal_release_channel)
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences__internal_release_channel_set_last_version),
+        onClick = {
+          SignalStore.releaseChannelValues().highestVersionNoteReceived = max(SignalStore.releaseChannelValues().highestVersionNoteReceived - 10, 0)
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences__internal_fetch_release_channel),
+        onClick = {
+          SignalStore.releaseChannelValues().previousManifestMd5 = ByteArray(0)
+          RetrieveReleaseChannelJob.enqueue(force = true)
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences__internal_add_sample_note),
+        onClick = {
+          viewModel.addSampleReleaseNote()
+        }
+      )
+
+      dividerPref()
+
+      sectionHeaderPref(R.string.ConversationListTabs__stories)
+      switchPref(
+        title = DSLSettingsText.from(R.string.preferences__internal_disable_stories),
+        isChecked = state.disableStories,
+        onClick = {
+          viewModel.toggleStories()
+        }
+      )
     }
   }
 

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

@@ -2,7 +2,17 @@ package org.thoughtcrime.securesms.components.settings.app.internal
 
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
+import org.thoughtcrime.securesms.database.MessageDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.addStyle
+import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.emoji.EmojiFiles
+import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
+import org.thoughtcrime.securesms.jobs.CreateReleaseChannelJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
 
 class InternalSettingsRepository(context: Context) {
 
@@ -13,4 +23,38 @@ class InternalSettingsRepository(context: Context) {
       consumer(EmojiFiles.Version.readVersion(context))
     }
   }
+
+  fun addSampleReleaseNote() {
+    SignalExecutors.UNBOUNDED.execute {
+      ApplicationDependencies.getJobManager().runSynchronously(CreateReleaseChannelJob.create(), 5000)
+
+      val title = "Release Note Title"
+      val bodyText = "Release note body. Aren't I awesome?"
+      val body = "$title\n\n$bodyText"
+      val bodyRangeList = BodyRangeList.newBuilder()
+        .addStyle(BodyRangeList.BodyRange.Style.BOLD, 0, title.length)
+
+      val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!
+      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+
+      val insertResult: MessageDatabase.InsertResult? = ReleaseChannel.insertAnnouncement(
+        recipientId = recipientId,
+        body = body,
+        threadId = threadId,
+        messageRanges = bodyRangeList.build(),
+        image = "https://via.placeholder.com/720x480",
+        imageWidth = 720,
+        imageHeight = 480
+      )
+
+      SignalDatabase.sms.insertBoostRequestMessage(recipientId, threadId)
+
+      if (insertResult != null) {
+        SignalDatabase.attachments.getAttachmentsForMessage(insertResult.messageId)
+          .forEach { ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
+
+        ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.threadId)
+      }
+    }
+  }
 }

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

@@ -12,7 +12,7 @@ data class InternalSettingsState(
   val gv2ignoreP2PChanges: Boolean,
   val disableAutoMigrationInitiation: Boolean,
   val disableAutoMigrationNotification: Boolean,
-  val forceCensorship: Boolean,
+  val allowCensorshipSetting: Boolean,
   val callingServer: String,
   val audioProcessingMethod: CallManager.AudioProcessingMethod,
   val useBuiltInEmojiSet: Boolean,
@@ -20,4 +20,5 @@ data class InternalSettingsState(
   val removeSenderKeyMinimium: Boolean,
   val delayResends: Boolean,
   val disableStorageService: Boolean,
+  val disableStories: Boolean
 )

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

@@ -66,8 +66,8 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
-  fun setForceCensorship(enabled: Boolean) {
-    preferenceDataStore.putBoolean(InternalValues.FORCE_CENSORSHIP, enabled)
+  fun setAllowCensorshipSetting(enabled: Boolean) {
+    preferenceDataStore.putBoolean(InternalValues.ALLOW_CENSORSHIP_SETTING, enabled)
     refresh()
   }
 
@@ -96,6 +96,16 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
+  fun toggleStories() {
+    val newState = !SignalStore.storyValues().isFeatureDisabled
+    SignalStore.storyValues().isFeatureDisabled = newState
+    store.update { getState().copy(disableStories = newState) }
+  }
+
+  fun addSampleReleaseNote() {
+    repository.addSampleReleaseNote()
+  }
+
   private fun refresh() {
     store.update { getState().copy(emojiVersion = it.emojiVersion) }
   }
@@ -109,14 +119,15 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     gv2ignoreP2PChanges = SignalStore.internalValues().gv2IgnoreP2PChanges(),
     disableAutoMigrationInitiation = SignalStore.internalValues().disableGv1AutoMigrateInitiation(),
     disableAutoMigrationNotification = SignalStore.internalValues().disableGv1AutoMigrateNotification(),
-    forceCensorship = SignalStore.internalValues().forcedCensorship(),
+    allowCensorshipSetting = SignalStore.internalValues().allowChangingCensorshipSetting(),
     callingServer = SignalStore.internalValues().groupCallingServer(),
     audioProcessingMethod = SignalStore.internalValues().audioProcessingMethod(),
     useBuiltInEmojiSet = SignalStore.internalValues().forceBuiltInEmoji(),
     emojiVersion = null,
     removeSenderKeyMinimium = SignalStore.internalValues().removeSenderKeyMinimum(),
     delayResends = SignalStore.internalValues().delayResends(),
-    disableStorageService = SignalStore.internalValues().storageServiceDisabled()
+    disableStorageService = SignalStore.internalValues().storageServiceDisabled(),
+    disableStories = SignalStore.storyValues().isFeatureDisabled
   )
 
   class Factory(private val repository: InternalSettingsRepository) : ViewModelProvider.Factory {

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

@@ -15,10 +15,12 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import mobi.upod.timedurationpicker.TimeDurationPicker
 import mobi.upod.timedurationpicker.TimeDurationPickerDialog
+import org.signal.core.util.DimensionUnit
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.PassphraseChangeActivity
 import org.thoughtcrime.securesms.R
@@ -34,7 +36,12 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberListingMode
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.KeyCachingService
+import org.thoughtcrime.securesms.stories.Stories
+import org.thoughtcrime.securesms.stories.settings.custom.PrivateStorySettingsFragmentArgs
+import org.thoughtcrime.securesms.stories.settings.story.PrivateStoryItem
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.ExpirationUtil
@@ -71,6 +78,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     adapter.registerFactory(ValueClickPreference::class.java, LayoutFactory(::ValueClickPreferenceViewHolder, R.layout.value_click_preference_item))
+    PrivateStoryItem.register(adapter)
 
     val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
     val repository = PrivacySettingsRepository()
@@ -288,6 +296,55 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
         summary = DSLSettingsText.from(incognitoSummary),
       )
 
+      if (Stories.isFeatureAvailable()) {
+
+        dividerPref()
+
+        sectionHeaderPref(R.string.ConversationListTabs__stories)
+
+        if (!SignalStore.storyValues().isFeatureDisabled) {
+          customPref(
+            PrivateStoryItem.RecipientModel(
+              recipient = Recipient.self(),
+              onClick = { findNavController().safeNavigate(R.id.action_privacySettings_to_myStorySettings) }
+            )
+          )
+
+          space(DimensionUnit.DP.toPixels(24f).toInt())
+
+          customPref(
+            PrivateStoryItem.NewModel(
+              onClick = {
+                findNavController().safeNavigate(R.id.action_privacySettings_to_newPrivateStory)
+              }
+            )
+          )
+
+          state.privateStories.forEach {
+            customPref(
+              PrivateStoryItem.PartialModel(
+                privateStoryItemData = it,
+                onClick = { model ->
+                  findNavController().safeNavigate(
+                    R.id.action_privacySettings_to_privateStorySettings,
+                    PrivateStorySettingsFragmentArgs.Builder(model.privateStoryItemData.id).build().toBundle()
+                  )
+                }
+              )
+            )
+          }
+        }
+
+        switchPref(
+          title = DSLSettingsText.from(R.string.PrivacySettingsFragment__share_and_view_stories),
+          summary = DSLSettingsText.from(R.string.PrivacySettingsFragment__you_will_no_longer_be_able),
+          isChecked = state.isStoriesEnabled,
+          onClick = {
+            viewModel.setStoriesEnabled(!state.isStoriesEnabled)
+          }
+        )
+      }
+
       dividerPref()
 
       clickPref(

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

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.privacy
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListPartialRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -22,6 +23,12 @@ class PrivacySettingsRepository {
     }
   }
 
+  fun getPrivateStories(consumer: (List<DistributionListPartialRecord>) -> Unit) {
+    SignalExecutors.BOUNDED.execute {
+      consumer(SignalDatabase.distributionLists.getCustomListsForUi())
+    }
+  }
+
   fun syncReadReceiptState() {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components.settings.app.privacy
 
+import org.thoughtcrime.securesms.database.model.DistributionListPartialRecord
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 
 data class PrivacySettingsState(
@@ -15,5 +16,7 @@ data class PrivacySettingsState(
   val isObsoletePasswordEnabled: Boolean,
   val isObsoletePasswordTimeoutEnabled: Boolean,
   val obsoletePasswordTimeout: Int,
-  val universalExpireTimer: Int
+  val universalExpireTimer: Int,
+  val privateStories: List<DistributionListPartialRecord>,
+  val isStoriesEnabled: Boolean
 )

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

@@ -26,6 +26,11 @@ class PrivacySettingsViewModel(
       store.update { it.copy(blockedCount = count) }
       refresh()
     }
+
+    repository.getPrivateStories { privateStories ->
+      store.update { it.copy(privateStories = privateStories) }
+      refresh()
+    }
   }
 
   fun setReadReceiptsEnabled(enabled: Boolean) {
@@ -83,6 +88,11 @@ class PrivacySettingsViewModel(
     refresh()
   }
 
+  fun setStoriesEnabled(isStoriesEnabled: Boolean) {
+    SignalStore.storyValues().isFeatureDisabled = !isStoriesEnabled
+    refresh()
+  }
+
   fun refresh() {
     store.update(this::updateState)
   }
@@ -101,12 +111,14 @@ class PrivacySettingsViewModel(
       isObsoletePasswordEnabled = !TextSecurePreferences.isPasswordDisabled(ApplicationDependencies.getApplication()),
       isObsoletePasswordTimeoutEnabled = TextSecurePreferences.isPassphraseTimeoutEnabled(ApplicationDependencies.getApplication()),
       obsoletePasswordTimeout = TextSecurePreferences.getPassphraseTimeoutInterval(ApplicationDependencies.getApplication()),
-      universalExpireTimer = SignalStore.settings().universalExpireTimer
+      universalExpireTimer = SignalStore.settings().universalExpireTimer,
+      privateStories = emptyList(),
+      isStoriesEnabled = !SignalStore.storyValues().isFeatureDisabled
     )
   }
 
   private fun updateState(state: PrivacySettingsState): PrivacySettingsState {
-    return getState().copy(blockedCount = state.blockedCount)
+    return getState().copy(blockedCount = state.blockedCount, privateStories = state.privateStories)
   }
 
   class Factory(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt

@@ -138,6 +138,28 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences
 
       dividerPref()
 
+      sectionHeaderPref(R.string.preferences_communication__category_censorship_circumvention)
+
+      val censorshipSummaryResId: Int = when (state.censorshipCircumventionState) {
+        CensorshipCircumventionState.AVAILABLE -> R.string.preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship
+        CensorshipCircumventionState.AVAILABLE_MANUALLY_DISABLED -> R.string.preferences_communication__censorship_circumvention_you_have_manually_disabled
+        CensorshipCircumventionState.AVAILABLE_AUTOMATICALLY_ENABLED -> R.string.preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number
+        CensorshipCircumventionState.UNAVAILABLE_CONNECTED -> R.string.preferences_communication__censorship_circumvention_is_not_necessary_you_are_already_connected
+        CensorshipCircumventionState.UNAVAILABLE_NO_INTERNET -> R.string.preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet
+      }
+
+      switchPref(
+        title = DSLSettingsText.from(R.string.preferences_communication__censorship_circumvention),
+        summary = DSLSettingsText.from(censorshipSummaryResId),
+        isChecked = state.censorshipCircumventionEnabled,
+        isEnabled = state.censorshipCircumventionState.available,
+        onClick = {
+          viewModel.setCensorshipCircumventionEnabled(!state.censorshipCircumventionEnabled)
+        }
+      )
+
+      dividerPref()
+
       sectionHeaderPref(R.string.preferences_communication__category_sealed_sender)
 
       switchPref(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsState.kt

@@ -3,7 +3,26 @@ package org.thoughtcrime.securesms.components.settings.app.privacy.advanced
 data class AdvancedPrivacySettingsState(
   val isPushEnabled: Boolean,
   val alwaysRelayCalls: Boolean,
+  val censorshipCircumventionState: CensorshipCircumventionState,
+  val censorshipCircumventionEnabled: Boolean,
   val showSealedSenderStatusIcon: Boolean,
   val allowSealedSenderFromAnyone: Boolean,
   val showProgressSpinner: Boolean
 )
+
+enum class CensorshipCircumventionState(val available: Boolean) {
+  /** The setting is unavailable because you're connected to the websocket */
+  UNAVAILABLE_CONNECTED(false),
+
+  /** The setting is unavailable because you have no network access at all */
+  UNAVAILABLE_NO_INTERNET(false),
+
+  /** The setting is available, and the user manually disabled it even though we thought they were censored */
+  AVAILABLE_MANUALLY_DISABLED(true),
+
+  /** The setting is available, and it's on because we think the user is censored */
+  AVAILABLE_AUTOMATICALLY_ENABLED(true),
+
+  /** The setting is generically available */
+  AVAILABLE(true),
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt

@@ -4,23 +4,40 @@ import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraintObserver
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
+import org.thoughtcrime.securesms.keyvalue.SettingsValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.util.SingleLiveEvent
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 
 class AdvancedPrivacySettingsViewModel(
   private val sharedPreferences: SharedPreferences,
   private val repository: AdvancedPrivacySettingsRepository
-) : ViewModel() {
+) : ViewModel(), NetworkConstraintObserver.NetworkListener {
 
   private val store = Store(getState())
   private val singleEvents = SingleLiveEvent<Event>()
 
   val state: LiveData<AdvancedPrivacySettingsState> = store.stateLiveData
   val events: LiveData<Event> = singleEvents
+  val disposables: CompositeDisposable = CompositeDisposable()
+
+  init {
+    NetworkConstraintObserver.getInstance(ApplicationDependencies.getApplication()).addListener(this)
+    disposables.add(
+      ApplicationDependencies.getSignalWebSocket().webSocketState
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribe { refresh() }
+    )
+  }
 
   fun disablePushMessages() {
     store.update { getState().copy(showProgressSpinner = true) }
@@ -58,21 +75,88 @@ class AdvancedPrivacySettingsViewModel(
     refresh()
   }
 
+  fun setCensorshipCircumventionEnabled(enabled: Boolean) {
+    SignalStore.settings().setCensorshipCircumventionEnabled(enabled)
+    SignalStore.misc().isServiceReachableWithoutCircumvention = false
+    ApplicationDependencies.resetNetworkConnectionsAfterProxyChange()
+    refresh()
+  }
+
   fun refresh() {
     store.update { getState().copy(showProgressSpinner = it.showProgressSpinner) }
   }
 
-  private fun getState() = AdvancedPrivacySettingsState(
-    isPushEnabled = SignalStore.account().isRegistered,
-    alwaysRelayCalls = TextSecurePreferences.isTurnOnly(ApplicationDependencies.getApplication()),
-    showSealedSenderStatusIcon = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(
-      ApplicationDependencies.getApplication()
-    ),
-    allowSealedSenderFromAnyone = TextSecurePreferences.isUniversalUnidentifiedAccess(
-      ApplicationDependencies.getApplication()
-    ),
-    false
-  )
+  override fun onNetworkChanged() {
+    refresh()
+  }
+
+  override fun onCleared() {
+    NetworkConstraintObserver.getInstance(ApplicationDependencies.getApplication()).removeListener(this)
+    disposables.dispose()
+  }
+
+  private fun getState(): AdvancedPrivacySettingsState {
+    val censorshipCircumventionState = getCensorshipCircumventionState()
+
+    return AdvancedPrivacySettingsState(
+      isPushEnabled = SignalStore.account().isRegistered,
+      alwaysRelayCalls = TextSecurePreferences.isTurnOnly(ApplicationDependencies.getApplication()),
+      censorshipCircumventionState = censorshipCircumventionState,
+      censorshipCircumventionEnabled = getCensorshipCircumventionEnabled(censorshipCircumventionState),
+      showSealedSenderStatusIcon = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(
+        ApplicationDependencies.getApplication()
+      ),
+      allowSealedSenderFromAnyone = TextSecurePreferences.isUniversalUnidentifiedAccess(
+        ApplicationDependencies.getApplication()
+      ),
+      false
+    )
+  }
+
+  private fun getCensorshipCircumventionState(): CensorshipCircumventionState {
+    val countryCode: Int = PhoneNumberFormatter.getLocalCountryCode()
+    val isCountryCodeCensoredByDefault: Boolean = ApplicationDependencies.getSignalServiceNetworkAccess().isCountryCodeCensoredByDefault(countryCode)
+    val enabledState: SettingsValues.CensorshipCircumventionEnabled = SignalStore.settings().censorshipCircumventionEnabled
+    val hasInternet: Boolean = NetworkConstraint.isMet(ApplicationDependencies.getApplication())
+    val websocketConnected: Boolean = ApplicationDependencies.getSignalWebSocket().webSocketState.firstOrError().blockingGet() == WebSocketConnectionState.CONNECTED
+
+    return when {
+      SignalStore.internalValues().allowChangingCensorshipSetting() -> {
+        CensorshipCircumventionState.AVAILABLE
+      }
+      isCountryCodeCensoredByDefault && enabledState == SettingsValues.CensorshipCircumventionEnabled.DISABLED -> {
+        CensorshipCircumventionState.AVAILABLE_MANUALLY_DISABLED
+      }
+      isCountryCodeCensoredByDefault -> {
+        CensorshipCircumventionState.AVAILABLE_AUTOMATICALLY_ENABLED
+      }
+      !hasInternet && enabledState != SettingsValues.CensorshipCircumventionEnabled.ENABLED -> {
+        CensorshipCircumventionState.UNAVAILABLE_NO_INTERNET
+      }
+      websocketConnected && enabledState != SettingsValues.CensorshipCircumventionEnabled.ENABLED -> {
+        CensorshipCircumventionState.UNAVAILABLE_CONNECTED
+      }
+      else -> {
+        CensorshipCircumventionState.AVAILABLE
+      }
+    }
+  }
+
+  private fun getCensorshipCircumventionEnabled(state: CensorshipCircumventionState): Boolean {
+    return when (state) {
+      CensorshipCircumventionState.UNAVAILABLE_CONNECTED,
+      CensorshipCircumventionState.UNAVAILABLE_NO_INTERNET,
+      CensorshipCircumventionState.AVAILABLE_MANUALLY_DISABLED -> {
+        false
+      }
+      CensorshipCircumventionState.AVAILABLE_AUTOMATICALLY_ENABLED -> {
+        true
+      }
+      else -> {
+        SignalStore.settings().censorshipCircumventionEnabled == SettingsValues.CensorshipCircumventionEnabled.ENABLED
+      }
+    }
+  }
 
   enum class Event {
     DISABLE_PUSH_FAILED

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

@@ -6,10 +6,7 @@ import org.thoughtcrime.securesms.badges.models.Badge
  * Events that can arise from use of the donations apis.
  */
 sealed class DonationEvent {
-  class GooglePayUnavailableError(val throwable: Throwable) : DonationEvent()
   object RequestTokenSuccess : DonationEvent()
-  class RequestTokenError(val throwable: Throwable) : DonationEvent()
-  class PaymentConfirmationError(val throwable: Throwable) : DonationEvent()
   class PaymentConfirmationSuccess(val badge: Badge) : DonationEvent()
   class SubscriptionCancellationFailed(val throwable: Throwable) : DonationEvent()
   object SubscriptionCancelled : DonationEvent()

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

@@ -1,7 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription
-
-class DonationExceptions {
-  class SetupFailed(reason: Throwable) : Exception(reason)
-  object TimedOutWaitingForTokenRedemption : Exception()
-  object RedemptionFailed : Exception()
-}

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

@@ -13,7 +13,10 @@ import org.signal.donations.GooglePayApi
 import org.signal.donations.GooglePayPaymentSource
 import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.BoostReceiptRequestResponseJob
@@ -56,8 +59,6 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   private val googlePayApi = GooglePayApi(activity, StripeApi.Gateway(Environment.Donations.STRIPE_CONFIGURATION), Environment.Donations.GOOGLE_PAY_CONFIGURATION)
   private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, ApplicationDependencies.getOkHttpClient())
 
-  fun isGooglePayAvailable(): Completable = googlePayApi.queryIsReadyToPay()
-
   fun scheduleSyncForAccountRecordChange() {
     SignalExecutors.BOUNDED.execute {
       scheduleSyncForAccountRecordChangeSync()
@@ -88,14 +89,14 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   fun continuePayment(price: FiatMoney, paymentData: PaymentData): Completable {
     Log.d(TAG, "Creating payment intent for $price...", true)
     return stripeApi.createPaymentIntent(price, application.getString(R.string.Boost__thank_you_for_your_donation))
-      .onErrorResumeNext { Single.error(DonationExceptions.SetupFailed(it)) }
+      .onErrorResumeNext { Single.error(DonationError.getPaymentSetupError(DonationErrorSource.BOOST, it)) }
       .flatMapCompletable { result ->
         Log.d(TAG, "Created payment intent for $price.", true)
         when (result) {
-          is StripeApi.CreatePaymentIntentResult.AmountIsTooSmall -> Completable.error(DonationExceptions.SetupFailed(Exception("Boost amount is too small")))
-          is StripeApi.CreatePaymentIntentResult.AmountIsTooLarge -> Completable.error(DonationExceptions.SetupFailed(Exception("Boost amount is too large")))
-          is StripeApi.CreatePaymentIntentResult.CurrencyIsNotSupported -> Completable.error(DonationExceptions.SetupFailed(Exception("Boost currency is not supported")))
-          is StripeApi.CreatePaymentIntentResult.Success -> confirmPayment(paymentData, result.paymentIntent)
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooSmall -> Completable.error(DonationError.boostAmountTooSmall())
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooLarge -> Completable.error(DonationError.boostAmountTooLarge())
+          is StripeApi.CreatePaymentIntentResult.CurrencyIsNotSupported -> Completable.error(DonationError.invalidCurrencyForBoost())
+          is StripeApi.CreatePaymentIntentResult.Success -> confirmPayment(price, paymentData, result.paymentIntent)
         }
       }
   }
@@ -139,11 +140,15 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
       }
   }
 
-  private fun confirmPayment(paymentData: PaymentData, paymentIntent: StripeApi.PaymentIntent): Completable {
+  private fun confirmPayment(price: FiatMoney, paymentData: PaymentData, paymentIntent: StripeApi.PaymentIntent): Completable {
     Log.d(TAG, "Confirming payment intent...", true)
-    val confirmPayment = stripeApi.confirmPaymentIntent(GooglePayPaymentSource(paymentData), paymentIntent)
+    val confirmPayment = stripeApi.confirmPaymentIntent(GooglePayPaymentSource(paymentData), paymentIntent).onErrorResumeNext {
+      Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.BOOST, it))
+    }
+
     val waitOnRedemption = Completable.create {
-      Log.d(TAG, "Confirmed payment intent.", true)
+      Log.d(TAG, "Confirmed payment intent. Recording boost receipt and submitting badge reimbursement job chain.", true)
+      SignalDatabase.donationReceipts.addReceipt(DonationReceiptRecord.createForBoost(price))
 
       val countDownLatch = CountDownLatch(1)
       var finalJobState: JobTracker.JobState? = null
@@ -164,20 +169,20 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
             }
             JobTracker.JobState.FAILURE -> {
               Log.d(TAG, "Boost request response job chain failed permanently.", true)
-              it.onError(DonationExceptions.RedemptionFailed)
+              it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.BOOST))
             }
             else -> {
               Log.d(TAG, "Boost request response job chain ignored due to in-progress jobs.", true)
-              it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+              it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.BOOST))
             }
           }
         } else {
           Log.d(TAG, "Boost redemption timed out waiting for job completion.", true)
-          it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+          it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.BOOST))
         }
       } catch (e: InterruptedException) {
         Log.d(TAG, "Boost redemption job interrupted", e, true)
-        it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+        it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.BOOST))
       }
     }
 
@@ -236,20 +241,20 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
                 }
                 JobTracker.JobState.FAILURE -> {
                   Log.d(TAG, "Subscription request response job chain failed permanently.", true)
-                  it.onError(DonationExceptions.RedemptionFailed)
+                  it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION))
                 }
                 else -> {
                   Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true)
-                  it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+                  it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
                 }
               }
             } else {
               Log.d(TAG, "Subscription request response job timed out.", true)
-              it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+              it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
             }
           } catch (e: InterruptedException) {
             Log.w(TAG, "Subscription request response interrupted.", e, true)
-            it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
+            it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
           }
         }
       }.doOnError {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.boost
 
+import android.content.DialogInterface
 import android.text.SpannableStringBuilder
 import android.view.View
 import androidx.appcompat.app.AlertDialog
@@ -10,6 +11,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.LottieAnimationView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
@@ -22,20 +24,22 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag
 import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationExceptions
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorDialogs
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.models.Progress
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyboard.findListener
 import org.thoughtcrime.securesms.util.BottomSheetUtil.requireCoordinatorLayout
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.Projection
 import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
@@ -63,6 +67,8 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
   private lateinit var processingDonationPaymentDialog: AlertDialog
   private lateinit var donationPaymentComponent: DonationPaymentComponent
 
+  private var errorDialog: DialogInterface? = null
+
   private val sayThanks: CharSequence by lazy {
     SpannableStringBuilder(requireContext().getString(R.string.BoostFragment__say_thanks_and_earn, 30))
       .append(" ")
@@ -74,7 +80,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
   }
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    donationPaymentComponent = findListener()!!
+    donationPaymentComponent = requireListener()
     viewModel.refresh()
 
     CurrencySelection.register(adapter)
@@ -118,10 +124,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
     lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
     lifecycleDisposable += viewModel.events.subscribe { event: DonationEvent ->
       when (event) {
-        is DonationEvent.GooglePayUnavailableError -> Unit
-        is DonationEvent.PaymentConfirmationError -> onPaymentError(event.throwable)
         is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed(event.badge)
-        is DonationEvent.RequestTokenError -> onPaymentError(DonationExceptions.SetupFailed(event.throwable))
         DonationEvent.RequestTokenSuccess -> Log.i(TAG, "Successfully got request token from Google Pay")
         DonationEvent.SubscriptionCancelled -> Unit
         is DonationEvent.SubscriptionCancellationFailed -> Unit
@@ -130,6 +133,13 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
     lifecycleDisposable += donationPaymentComponent.googlePayResultPublisher.subscribe {
       viewModel.onActivityResult(it.requestCode, it.resultCode, it.data)
     }
+
+    lifecycleDisposable += DonationError
+      .getErrorsForSource(DonationErrorSource.BOOST)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { donationError ->
+        onPaymentError(donationError)
+      }
   }
 
   override fun onDestroyView() {
@@ -240,37 +250,21 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun onPaymentError(throwable: Throwable?) {
-    if (throwable is DonationExceptions.TimedOutWaitingForTokenRedemption) {
-      Log.w(TAG, "Timed out while redeeming token", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__still_processing)
-        .setMessage(R.string.DonationsErrors__your_payment_is_still)
-        .setPositiveButton(android.R.string.ok) { dialog, _ ->
-          dialog.dismiss()
-          findNavController().popBackStack()
-        }
-        .show()
-    } else if (throwable is DonationExceptions.SetupFailed) {
-      Log.w(TAG, "Error occurred while processing payment", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__error_processing_payment)
-        .setMessage(R.string.DonationsErrors__your_payment)
-        .setPositiveButton(android.R.string.ok) { dialog, _ ->
-          dialog.dismiss()
-          findNavController().popBackStack()
-        }
-        .show()
-    } else {
-      Log.w(TAG, "Error occurred while trying to redeem token", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__couldnt_add_badge)
-        .setMessage(R.string.DonationsErrors__your_badge_could_not)
-        .setPositiveButton(R.string.Subscription__contact_support) { dialog, _ ->
-          dialog.dismiss()
-          findNavController().popBackStack()
-        }
-        .show()
+    Log.w(TAG, "onPaymentError", throwable, true)
+
+    if (errorDialog != null) {
+      Log.i(TAG, "Already displaying an error dialog. Skipping.")
+      return
     }
+
+    errorDialog = DonationErrorDialogs.show(
+      requireContext(), throwable,
+      object : DonationErrorDialogs.DialogCallback() {
+        override fun onDialogDismissed() {
+          findNavController().popBackStack()
+        }
+      }
+    )
   }
 
   private fun startAnimationAboveSelectedBoost(view: View) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt

@@ -18,12 +18,14 @@ import org.signal.donations.GooglePayApi
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
 import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
 import org.thoughtcrime.securesms.util.StringUtil
 import org.thoughtcrime.securesms.util.livedata.Store
-import java.lang.NumberFormatException
 import java.math.BigDecimal
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
@@ -108,11 +110,6 @@ class BoostViewModel(
       }
     )
 
-    disposables += donationPaymentRepository.isGooglePayAvailable().subscribeBy(
-      onComplete = { store.update { it.copy(isGooglePayAvailable = true) } },
-      onError = { eventPublisher.onNext(DonationEvent.GooglePayUnavailableError(it)) }
-    )
-
     disposables += currencyObservable.subscribeBy { currency ->
       store.update {
         it.copy(
@@ -146,7 +143,13 @@ class BoostViewModel(
             donationPaymentRepository.continuePayment(boost.price, paymentData).subscribeBy(
               onError = { throwable ->
                 store.update { it.copy(stage = BoostState.Stage.READY) }
-                eventPublisher.onNext(DonationEvent.PaymentConfirmationError(throwable))
+                val donationError: DonationError = if (throwable is DonationError) {
+                  throwable
+                } else {
+                  Log.w(TAG, "Failed to complete payment or redemption", throwable, true)
+                  DonationError.genericBadgeRedemptionFailure(DonationErrorSource.BOOST)
+                }
+                DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError)
               },
               onComplete = {
                 store.update { it.copy(stage = BoostState.Stage.READY) }
@@ -160,7 +163,7 @@ class BoostViewModel(
 
         override fun onError(googlePayException: GooglePayApi.GooglePayException) {
           store.update { it.copy(stage = BoostState.Stage.READY) }
-          eventPublisher.onNext(DonationEvent.RequestTokenError(googlePayException))
+          DonationError.routeDonationError(ApplicationDependencies.getApplication(), DonationError.getGooglePayRequestTokenError(DonationErrorSource.BOOST, googlePayException))
         }
 
         override fun onCancelled() {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.keyboard.findListener
+import org.thoughtcrime.securesms.util.fragments.requireListener
 import java.util.Locale
 
 /**
@@ -25,7 +25,7 @@ class SetCurrencyFragment : DSLSettingsBottomSheetFragment() {
   )
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    donationPaymentComponent = findListener()!!
+    donationPaymentComponent = requireListener()
 
     viewModel.state.observe(viewLifecycleOwner) { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt

@@ -0,0 +1,154 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.signal.core.util.logging.Log
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeError
+
+sealed class DonationError(val source: DonationErrorSource, cause: Throwable) : Exception(cause) {
+
+  /**
+   * Google Pay errors, which happen well before a user would ever be charged.
+   */
+  sealed class GooglePayError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    class NotAvailableError(source: DonationErrorSource, cause: Throwable) : GooglePayError(source, cause)
+    class RequestTokenError(source: DonationErrorSource, cause: Throwable) : GooglePayError(source, cause)
+  }
+
+  /**
+   * Boost validation errors, which occur before the user could be charged.
+   */
+  sealed class BoostError(message: String) : DonationError(DonationErrorSource.BOOST, Exception(message)) {
+    object AmountTooSmallError : BoostError("Amount is too small")
+    object AmountTooLargeError : BoostError("Amount is too large")
+    object InvalidCurrencyError : BoostError("Currency is not supported")
+  }
+
+  /**
+   * Stripe setup errors, which occur before the user could be charged. These are either
+   * payment processing handed to Stripe from the CC company (in the case of a Boost payment
+   * intent confirmation error) or other generic error from Stripe.
+   */
+  sealed class PaymentSetupError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    /**
+     * Payment setup failed in some generic fashion.
+     */
+    class GenericError(source: DonationErrorSource, cause: Throwable) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment setup failed in some way, which we are told about by Stripe.
+     */
+    class CodedError(source: DonationErrorSource, cause: Throwable, val errorCode: String) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment failed by the credit card processor, with a specific reason told to us by Stripe.
+     */
+    class DeclinedError(source: DonationErrorSource, cause: Throwable, val declineCode: StripeDeclineCode) : PaymentSetupError(source, cause)
+  }
+
+  /**
+   * Errors that can be thrown after we submit a payment to Stripe. It is
+   * assumed that at this point, anything we submit *could* happen, so we can no
+   * longer safely assume a user has not been charged. Payment errors explicitly
+   * originate from Signal service.
+   */
+  sealed class PaymentProcessingError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    class GenericError(source: DonationErrorSource) : DonationError(source, Exception("Generic Payment Error"))
+  }
+
+  /**
+   * Errors that can occur during the badge redemption process.
+   */
+  sealed class BadgeRedemptionError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    /**
+     * Timeout elapsed while the user was waiting for badge redemption to complete. This is not an indication that
+     * redemption failed, just that it is taking longer than we can reasonably show a spinner.
+     */
+    class TimeoutWaitingForTokenError(source: DonationErrorSource) : BadgeRedemptionError(source, Exception("Timed out waiting for badge redemption to complete."))
+
+    /**
+     * Some generic error not otherwise accounted for occurred during the redemption process.
+     */
+    class GenericError(source: DonationErrorSource) : BadgeRedemptionError(source, Exception("Failed to add badge to account."))
+  }
+
+  companion object {
+
+    private val TAG = Log.tag(DonationError::class.java)
+
+    private val donationErrorSubjectSourceMap: Map<DonationErrorSource, Subject<DonationError>> = DonationErrorSource.values().associate { source ->
+      source to PublishSubject.create()
+    }
+
+    @JvmStatic
+    fun getErrorsForSource(donationErrorSource: DonationErrorSource): Observable<DonationError> {
+      return donationErrorSubjectSourceMap[donationErrorSource]!!
+    }
+
+    /**
+     * Route a given donation error, which will either pipe it out to an appropriate subject
+     * or, if the subject has no observers, post it as a notification.
+     */
+    @JvmStatic
+    fun routeDonationError(context: Context, error: DonationError) {
+      val subject: Subject<DonationError> = donationErrorSubjectSourceMap[error.source]!!
+      when {
+        subject.hasObservers() -> {
+          Log.i(TAG, "Routing donation error to subject ${error.source} dialog", error)
+          subject.onNext(error)
+        }
+        else -> {
+          Log.i(TAG, "Routing donation error to subject ${error.source} notification", error)
+          DonationErrorNotifications.displayErrorNotification(context, error)
+        }
+      }
+    }
+
+    @JvmStatic
+    fun getGooglePayRequestTokenError(source: DonationErrorSource, throwable: Throwable): DonationError {
+      return GooglePayError.RequestTokenError(source, throwable)
+    }
+
+    /**
+     * Converts a throwable into a payment setup error. This should only be used when
+     * handling errors handed back via the Stripe API, when we know for sure that no
+     * charge has occurred.
+     */
+    @JvmStatic
+    fun getPaymentSetupError(source: DonationErrorSource, throwable: Throwable): DonationError {
+      return if (throwable is StripeError.PostError) {
+        val declineCode: StripeDeclineCode? = throwable.declineCode
+        val errorCode: String? = throwable.errorCode
+
+        when {
+          declineCode != null -> PaymentSetupError.DeclinedError(source, throwable, declineCode)
+          errorCode != null -> PaymentSetupError.CodedError(source, throwable, errorCode)
+          else -> PaymentSetupError.GenericError(source, throwable)
+        }
+      } else {
+        PaymentSetupError.GenericError(source, throwable)
+      }
+    }
+
+    @JvmStatic
+    fun boostAmountTooSmall(): DonationError = BoostError.AmountTooSmallError
+
+    @JvmStatic
+    fun boostAmountTooLarge(): DonationError = BoostError.AmountTooLargeError
+
+    @JvmStatic
+    fun invalidCurrencyForBoost(): DonationError = BoostError.InvalidCurrencyError
+
+    @JvmStatic
+    fun timeoutWaitingForToken(source: DonationErrorSource): DonationError = BadgeRedemptionError.TimeoutWaitingForTokenError(source)
+
+    @JvmStatic
+    fun genericBadgeRedemptionFailure(source: DonationErrorSource): DonationError = BadgeRedemptionError.GenericError(source)
+
+    @JvmStatic
+    fun genericPaymentFailure(source: DonationErrorSource): DonationError = PaymentProcessingError.GenericError(source)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorDialogs.kt

@@ -0,0 +1,89 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import android.content.DialogInterface
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.help.HelpFragment
+import org.thoughtcrime.securesms.util.CommunicationActions
+
+/**
+ * Donation Error Dialogs.
+ */
+object DonationErrorDialogs {
+  /**
+   * Displays a dialog, and returns a handle to it for dismissal.
+   */
+  fun show(context: Context, throwable: Throwable?, callback: DialogCallback): DialogInterface {
+    val builder = MaterialAlertDialogBuilder(context)
+
+    builder.setOnDismissListener { callback.onDialogDismissed() }
+
+    val params = DonationErrorParams.create(context, throwable, callback)
+
+    if (params.title != null) {
+      builder.setTitle(params.title)
+    }
+
+    if (params.message != null) {
+      builder.setMessage(params.message)
+    }
+
+    if (params.positiveAction != null) {
+      builder.setPositiveButton(params.positiveAction.label) { _, _ -> params.positiveAction.action() }
+    }
+
+    if (params.negativeAction != null) {
+      builder.setNegativeButton(params.negativeAction.label) { _, _ -> params.negativeAction.action() }
+    }
+
+    return builder.show()
+  }
+
+  open class DialogCallback : DonationErrorParams.Callback<Unit> {
+
+    override fun onCancel(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = android.R.string.cancel,
+        action = {}
+      )
+    }
+
+    override fun onOk(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = android.R.string.ok,
+        action = {}
+      )
+    }
+
+    override fun onGoToGooglePay(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__go_to_google_pay,
+        action = {
+          CommunicationActions.openBrowserLink(context, context.getString(R.string.google_pay_url))
+        }
+      )
+    }
+
+    override fun onLearnMore(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__learn_more,
+        action = {
+          CommunicationActions.openBrowserLink(context, context.getString(R.string.donation_decline_code_error_url))
+        }
+      )
+    }
+
+    override fun onContactSupport(context: Context): DonationErrorParams.ErrorAction<Unit> {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.Subscription__contact_support,
+        action = {
+          context.startActivity(AppSettingsActivity.help(context, HelpFragment.DONATION_INDEX))
+        }
+      )
+    }
+
+    open fun onDialogDismissed() = Unit
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorNotifications.kt

@@ -0,0 +1,99 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.help.HelpFragment
+import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.NotificationIds
+
+/**
+ * Donation-related push notifications.
+ */
+object DonationErrorNotifications {
+  fun displayErrorNotification(context: Context, donationError: DonationError) {
+    val parameters = DonationErrorParams.create(context, donationError, NotificationCallback)
+    val notification = NotificationCompat.Builder(context, NotificationChannels.FAILURES)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle(context.getString(parameters.title))
+      .setContentText(context.getString(parameters.message)).apply {
+        if (parameters.positiveAction != null) {
+          addAction(context, parameters.positiveAction)
+        }
+
+        if (parameters.negativeAction != null) {
+          addAction(context, parameters.negativeAction)
+        }
+      }
+      .build()
+
+    NotificationManagerCompat
+      .from(context)
+      .notify(NotificationIds.DONOR_BADGE_FAILURE, notification)
+  }
+
+  private fun NotificationCompat.Builder.addAction(context: Context, errorAction: DonationErrorParams.ErrorAction<PendingIntent>) {
+    addAction(
+      NotificationCompat.Action.Builder(
+        null,
+        context.getString(errorAction.label),
+        errorAction.action.invoke()
+      ).build()
+    )
+  }
+
+  private object NotificationCallback : DonationErrorParams.Callback<PendingIntent> {
+
+    override fun onCancel(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+
+    override fun onOk(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+
+    override fun onLearnMore(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.DeclineCode__learn_more,
+        actionIntent = Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_decline_code_error_url)))
+      )
+    }
+
+    override fun onGoToGooglePay(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.DeclineCode__go_to_google_pay,
+        actionIntent = Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.google_pay_url)))
+      )
+    }
+
+    override fun onContactSupport(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.Subscription__contact_support,
+        actionIntent = AppSettingsActivity.help(context, HelpFragment.DONATION_INDEX)
+      )
+    }
+
+    private fun createAction(
+      context: Context,
+      label: Int,
+      actionIntent: Intent
+    ): DonationErrorParams.ErrorAction<PendingIntent> {
+      return DonationErrorParams.ErrorAction(
+        label = label,
+        action = {
+          PendingIntent.getActivity(
+            context,
+            0,
+            actionIntent,
+            if (Build.VERSION.SDK_INT >= 23) PendingIntent.FLAG_ONE_SHOT else 0
+          )
+        }
+      )
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt

@@ -0,0 +1,97 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import androidx.annotation.StringRes
+import org.signal.donations.StripeDeclineCode
+import org.thoughtcrime.securesms.R
+
+class DonationErrorParams<V> private constructor(
+  @StringRes val title: Int,
+  @StringRes val message: Int,
+  val positiveAction: ErrorAction<V>?,
+  val negativeAction: ErrorAction<V>?
+) {
+  class ErrorAction<V>(
+    @StringRes val label: Int,
+    val action: () -> V
+  )
+
+  companion object {
+    fun <V> create(
+      context: Context,
+      throwable: Throwable?,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      return when (throwable) {
+        is DonationError.PaymentSetupError.DeclinedError -> getDeclinedErrorParams(context, throwable, callback)
+        is DonationError.PaymentSetupError -> DonationErrorParams(
+          title = R.string.DonationsErrors__error_processing_payment,
+          message = R.string.DonationsErrors__your_payment,
+          positiveAction = callback.onOk(context),
+          negativeAction = null
+        )
+        is DonationError.BadgeRedemptionError.TimeoutWaitingForTokenError -> DonationErrorParams(
+          title = R.string.DonationsErrors__still_processing,
+          message = R.string.DonationsErrors__your_payment_is_still,
+          positiveAction = callback.onOk(context),
+          negativeAction = null
+        )
+        else -> DonationErrorParams(
+          title = R.string.DonationsErrors__couldnt_add_badge,
+          message = R.string.DonationsErrors__your_badge_could_not,
+          positiveAction = callback.onContactSupport(context),
+          negativeAction = null
+        )
+      }
+    }
+
+    private fun <V> getDeclinedErrorParams(context: Context, declinedError: DonationError.PaymentSetupError.DeclinedError, callback: Callback<V>): DonationErrorParams<V> {
+      return when (declinedError.declineCode) {
+        is StripeDeclineCode.Known -> when (declinedError.declineCode.code) {
+          StripeDeclineCode.Code.APPROVE_WITH_ID -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again)
+          StripeDeclineCode.Code.CALL_ISSUER -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again_if_the_problem)
+          StripeDeclineCode.Code.CARD_NOT_SUPPORTED -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_support_this_type_of_purchase)
+          StripeDeclineCode.Code.EXPIRED_CARD -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__your_card_has_expired)
+          StripeDeclineCode.Code.INCORRECT_NUMBER -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__your_card_number_is_incorrect)
+          StripeDeclineCode.Code.INCORRECT_CVC -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__your_cards_cvc_number_is_incorrect)
+          StripeDeclineCode.Code.INSUFFICIENT_FUNDS -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_have_sufficient_funds)
+          StripeDeclineCode.Code.INVALID_CVC -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__your_cards_cvc_number_is_incorrect)
+          StripeDeclineCode.Code.INVALID_EXPIRY_MONTH -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__the_expiration_month)
+          StripeDeclineCode.Code.INVALID_EXPIRY_YEAR -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__the_expiration_year)
+          StripeDeclineCode.Code.INVALID_NUMBER -> getGoToGooglePayParams(context, callback, R.string.DeclineCode__your_card_number_is_incorrect)
+          StripeDeclineCode.Code.ISSUER_NOT_AVAILABLE -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_completing_the_payment_again)
+          StripeDeclineCode.Code.PROCESSING_ERROR -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_again)
+          StripeDeclineCode.Code.REENTER_TRANSACTION -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_again)
+          else -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank)
+        }
+        else -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank)
+      }
+    }
+
+    private fun <V> getLearnMoreParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onOk(context),
+        negativeAction = callback.onLearnMore(context)
+      )
+    }
+
+    private fun <V> getGoToGooglePayParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onGoToGooglePay(context),
+        negativeAction = callback.onCancel(context)
+      )
+    }
+  }
+
+  interface Callback<V> {
+    fun onOk(context: Context): ErrorAction<V>?
+    fun onCancel(context: Context): ErrorAction<V>?
+    fun onLearnMore(context: Context): ErrorAction<V>?
+    fun onContactSupport(context: Context): ErrorAction<V>?
+    fun onGoToGooglePay(context: Context): ErrorAction<V>?
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt

@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+enum class DonationErrorSource(private val code: String) {
+  BOOST("boost"),
+  SUBSCRIPTION("subscription"),
+  KEEP_ALIVE("keep-alive"),
+  UNKNOWN("unknown");
+
+  fun serialize(): String = code
+
+  companion object {
+    @JvmStatic
+    fun deserialize(code: String): DonationErrorSource {
+      return values().firstOrNull { it.code == code } ?: UNKNOWN
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt

@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+/**
+ * Error states that can occur if we detect that a user's subscription has been cancelled and the manual
+ * cancellation flag is not set.
+ */
+enum class UnexpectedSubscriptionCancellation(val status: String) {
+  PAST_DUE("past_due"),
+  CANCELED("canceled"),
+  UNPAID("unpaid"),
+  INACTIVE("user-was-inactive");
+
+  companion object {
+    @JvmStatic
+    fun fromStatus(status: String?): UnexpectedSubscriptionCancellation? {
+      return values().firstOrNull { it.status == status }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt

@@ -147,6 +147,14 @@ class ManageDonationsFragment : DSLSettingsFragment() {
         icon = DSLSettingsIcon.from(R.drawable.ic_help_24),
         linkId = R.string.donate_url
       )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.ManageDonationsFragment__tax_receipts),
+        icon = DSLSettingsIcon.from(R.drawable.ic_receipt_24),
+        onClick = {
+          findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonationReceiptListFragment())
+        }
+      )
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt

@@ -0,0 +1,161 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import android.app.ProgressDialog
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.graphics.Bitmap
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.ShareCompat
+import androidx.core.view.drawToBitmap
+import androidx.fragment.app.viewModels
+import com.google.android.material.button.MaterialButton
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+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.components.settings.models.SplashImage
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask
+import java.io.ByteArrayOutputStream
+import java.util.Locale
+
+class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.donation_receipt_detail_fragment) {
+
+  private lateinit var progressDialog: ProgressDialog
+
+  private val viewModel: DonationReceiptDetailViewModel by viewModels(
+    factoryProducer = {
+      DonationReceiptDetailViewModel.Factory(
+        DonationReceiptDetailFragmentArgs.fromBundle(requireArguments()).id,
+        DonationReceiptDetailRepository()
+      )
+    }
+  )
+
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    SplashImage.register(adapter)
+
+    val sharePngButton: MaterialButton = requireView().findViewById(R.id.share_png)
+    sharePngButton.isEnabled = false
+
+    viewModel.state.observe(viewLifecycleOwner) { state ->
+      if (state.donationReceiptRecord != null) {
+        adapter.submitList(getConfiguration(state.donationReceiptRecord, state.subscriptionName).toMappingModelList())
+      }
+
+      if (state.donationReceiptRecord != null && state.subscriptionName != null) {
+        sharePngButton.isEnabled = true
+        sharePngButton.setOnClickListener {
+          renderPng(state.donationReceiptRecord, state.subscriptionName)
+        }
+      }
+    }
+  }
+
+  private fun renderPng(record: DonationReceiptRecord, subscriptionName: String) {
+    progressDialog = ProgressDialog(requireContext())
+    progressDialog.show()
+
+    val today: String = DateUtils.formatDateWithDayOfWeek(Locale.getDefault(), System.currentTimeMillis())
+    val amount: String = FiatMoneyUtil.format(resources, record.amount)
+    val type: String = when (record.type) {
+      DonationReceiptRecord.Type.RECURRING -> getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, getString(R.string.DonationReceiptListFragment__recurring))
+      DonationReceiptRecord.Type.BOOST -> getString(R.string.DonationReceiptListFragment__one_time)
+    }
+    val datePaid: String = DateUtils.formatDate(Locale.getDefault(), record.timestamp)
+
+    SimpleTask.run(viewLifecycleOwner.lifecycle, {
+      val outputStream = ByteArrayOutputStream()
+      val view = LayoutInflater
+        .from(requireContext())
+        .inflate(R.layout.donation_receipt_png, null)
+
+      view.findViewById<TextView>(R.id.date).text = today
+      view.findViewById<TextView>(R.id.amount).text = amount
+      view.findViewById<TextView>(R.id.donation_type).text = type
+      view.findViewById<TextView>(R.id.date_paid).text = datePaid
+
+      view.measure(View.MeasureSpec.makeMeasureSpec(DONATION_RECEIPT_WIDTH, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
+      view.layout(0, 0, view.measuredWidth, view.measuredHeight)
+
+      val bitmap = view.drawToBitmap()
+      bitmap.compress(Bitmap.CompressFormat.PNG, 0, outputStream)
+
+      BlobProvider.getInstance()
+        .forData(outputStream.toByteArray())
+        .withMimeType("image/png")
+        .withFileName("Signal-Donation-Receipt.png")
+        .createForSingleSessionInMemory()
+    }, {
+      progressDialog.dismiss()
+      openShareSheet(it)
+    })
+  }
+
+  private fun openShareSheet(uri: Uri) {
+    val mimeType = Intent.normalizeMimeType("image/png")
+    val shareIntent = ShareCompat.IntentBuilder(requireContext())
+      .setStream(uri)
+      .setType(mimeType)
+      .createChooserIntent()
+      .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+    try {
+      startActivity(shareIntent)
+    } catch (e: ActivityNotFoundException) {
+      Log.w(TAG, "No activity existed to share the media.", e)
+      Toast.makeText(requireContext(), R.string.MediaPreviewActivity_cant_find_an_app_able_to_share_this_media, Toast.LENGTH_LONG).show()
+    }
+  }
+
+  private fun getConfiguration(record: DonationReceiptRecord, subscriptionName: String?): DSLConfiguration {
+    return configure {
+      customPref(
+        SplashImage.Model(
+          splashImageResId = R.drawable.ic_signal_logo_type
+        )
+      )
+
+      textPref(
+        title = DSLSettingsText.from(
+          charSequence = FiatMoneyUtil.format(resources, record.amount),
+          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Giant),
+          DSLSettingsText.CenterModifier
+        )
+      )
+
+      dividerPref()
+
+      textPref(
+        title = DSLSettingsText.from(R.string.DonationReceiptDetailsFragment__donation_type),
+        summary = DSLSettingsText.from(
+          when (record.type) {
+            DonationReceiptRecord.Type.RECURRING -> getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, getString(R.string.DonationReceiptListFragment__recurring))
+            DonationReceiptRecord.Type.BOOST -> getString(R.string.DonationReceiptListFragment__one_time)
+          }
+        )
+      )
+
+      textPref(
+        title = DSLSettingsText.from(R.string.DonationReceiptDetailsFragment__date_paid),
+        summary = record.let { DSLSettingsText.from(DateUtils.formatDateWithYear(Locale.getDefault(), it.timestamp)) }
+      )
+    }
+  }
+
+  companion object {
+    private const val DONATION_RECEIPT_WIDTH = 1916
+
+    private val TAG = Log.tag(DonationReceiptDetailFragment::class.java)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt

@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import java.util.Locale
+
+class DonationReceiptDetailRepository {
+  fun getSubscriptionLevelName(subscriptionLevel: Int): Single<String> {
+    return ApplicationDependencies
+      .getDonationsService()
+      .getSubscriptionLevels(Locale.getDefault())
+      .flatMap { it.flattenResult() }
+      .map { it.levels[subscriptionLevel.toString()] ?: throw Exception("Subscription level $subscriptionLevel not found") }
+      .map { it.name }
+      .subscribeOn(Schedulers.io())
+  }
+
+  fun getDonationReceiptRecord(id: Long): Single<DonationReceiptRecord> {
+    return Single.fromCallable<DonationReceiptRecord> {
+      SignalDatabase.donationReceipts.getReceipt(id)
+    }.subscribeOn(Schedulers.io())
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailState.kt

@@ -0,0 +1,8 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+data class DonationReceiptDetailState(
+  val donationReceiptRecord: DonationReceiptRecord? = null,
+  val subscriptionName: String? = null
+)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailViewModel.kt

@@ -0,0 +1,70 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+import org.thoughtcrime.securesms.util.livedata.Store
+
+class DonationReceiptDetailViewModel(id: Long, private val repository: DonationReceiptDetailRepository) : ViewModel() {
+
+  private val store = Store(DonationReceiptDetailState())
+  private val disposables = CompositeDisposable()
+  private var networkDisposable: Disposable
+  private val cachedRecord: Single<DonationReceiptRecord> = repository.getDonationReceiptRecord(id).cache()
+
+  val state: LiveData<DonationReceiptDetailState> = store.stateLiveData
+
+  init {
+    networkDisposable = InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retry()
+        }
+      }
+
+    refresh()
+  }
+
+  private fun retry() {
+    if (store.state.subscriptionName == null) {
+      refresh()
+    }
+  }
+
+  private fun refresh() {
+    disposables.clear()
+
+    disposables += cachedRecord.subscribe { record ->
+      store.update { it.copy(donationReceiptRecord = record) }
+    }
+
+    disposables += cachedRecord.flatMap {
+      if (it.subscriptionLevel > 0) {
+        repository.getSubscriptionLevelName(it.subscriptionLevel)
+      } else {
+        Single.just("")
+      }
+    }.subscribe { name ->
+      store.update { it.copy(subscriptionName = name) }
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+    networkDisposable.dispose()
+  }
+
+  class Factory(private val id: Long, private val repository: DonationReceiptDetailRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptDetailViewModel(id, repository)) as T
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptBadge.kt

@@ -0,0 +1,10 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+data class DonationReceiptBadge(
+  val type: DonationReceiptRecord.Type,
+  val level: Int,
+  val badge: Badge
+)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListAdapter.kt

@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.SectionHeaderPreference
+import org.thoughtcrime.securesms.components.settings.SectionHeaderPreferenceViewHolder
+import org.thoughtcrime.securesms.components.settings.TextPreference
+import org.thoughtcrime.securesms.components.settings.TextPreferenceViewHolder
+import org.thoughtcrime.securesms.util.StickyHeaderDecoration
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.toLocalDateTime
+
+class DonationReceiptListAdapter(onModelClick: (DonationReceiptListItem.Model) -> Unit) : MappingAdapter(), StickyHeaderDecoration.StickyHeaderAdapter<SectionHeaderPreferenceViewHolder> {
+
+  init {
+    registerFactory(TextPreference::class.java, LayoutFactory({ TextPreferenceViewHolder(it) }, R.layout.dsl_preference_item))
+    DonationReceiptListItem.register(this, onModelClick)
+  }
+
+  override fun getHeaderId(position: Int): Long {
+    return when (val item = getItem(position)) {
+      is DonationReceiptListItem.Model -> item.record.timestamp.toLocalDateTime().year.toLong()
+      else -> StickyHeaderDecoration.StickyHeaderAdapter.NO_HEADER_ID
+    }
+  }
+
+  override fun onCreateHeaderViewHolder(parent: ViewGroup?, position: Int, type: Int): SectionHeaderPreferenceViewHolder {
+    return SectionHeaderPreferenceViewHolder(LayoutInflater.from(parent!!.context).inflate(R.layout.dsl_section_header, parent, false))
+  }
+
+  override fun onBindHeaderViewHolder(viewHolder: SectionHeaderPreferenceViewHolder?, position: Int, type: Int) {
+    viewHolder?.bind(SectionHeaderPreference(DSLSettingsText.from(getHeaderId(position).toString())))
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListFragment.kt

@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.BoldSelectionTabItem
+import org.thoughtcrime.securesms.components.ControllableTabLayout
+
+class DonationReceiptListFragment : Fragment(R.layout.donation_receipt_list_fragment) {
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val pager: ViewPager2 = view.findViewById(R.id.pager)
+    val tabs: ControllableTabLayout = view.findViewById(R.id.tabs)
+    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
+
+    toolbar.setNavigationOnClickListener {
+      findNavController().popBackStack()
+    }
+
+    pager.adapter = DonationReceiptListPageAdapter(this)
+
+    BoldSelectionTabItem.registerListeners(tabs)
+
+    TabLayoutMediator(tabs, pager) { tab, position ->
+      tab.setText(
+        when (position) {
+          0 -> R.string.DonationReceiptListFragment__all
+          1 -> R.string.DonationReceiptListFragment__recurring
+          2 -> R.string.DonationReceiptListFragment__one_time
+          else -> error("Unsupported index $position")
+        }
+      )
+    }.attach()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListItem.kt

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.view.View
+import android.widget.TextView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.DateUtils
+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 java.util.Locale
+
+object DonationReceiptListItem {
+
+  fun register(adapter: MappingAdapter, onClick: (Model) -> Unit) {
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onClick) }, R.layout.donation_receipt_list_item))
+  }
+
+  class Model(
+    val record: DonationReceiptRecord,
+    val badge: Badge?
+  ) : MappingModel<Model> {
+    override fun areContentsTheSame(newItem: Model): Boolean = record == newItem.record && badge == newItem.badge
+
+    override fun areItemsTheSame(newItem: Model): Boolean = record.id == newItem.record.id
+  }
+
+  private class ViewHolder(itemView: View, private val onClick: (Model) -> Unit) : MappingViewHolder<Model>(itemView) {
+
+    private val badgeView: BadgeImageView = itemView.findViewById(R.id.badge)
+    private val dateView: TextView = itemView.findViewById(R.id.date)
+    private val typeView: TextView = itemView.findViewById(R.id.type)
+    private val moneyView: TextView = itemView.findViewById(R.id.money)
+
+    override fun bind(model: Model) {
+      itemView.setOnClickListener { onClick(model) }
+      badgeView.setBadge(model.badge)
+      dateView.text = DateUtils.formatDate(Locale.getDefault(), model.record.timestamp)
+      typeView.setText(
+        when (model.record.type) {
+          DonationReceiptRecord.Type.RECURRING -> R.string.DonationReceiptListFragment__recurring
+          DonationReceiptRecord.Type.BOOST -> R.string.DonationReceiptListFragment__one_time
+        }
+      )
+      moneyView.text = FiatMoneyUtil.format(context.resources, model.record.amount)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageAdapter.kt

@@ -0,0 +1,18 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+class DonationReceiptListPageAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+  override fun getItemCount(): Int = 3
+
+  override fun createFragment(position: Int): Fragment {
+    return when (position) {
+      0 -> DonationReceiptListPageFragment.create(null)
+      1 -> DonationReceiptListPageFragment.create(DonationReceiptRecord.Type.RECURRING)
+      2 -> DonationReceiptListPageFragment.create(DonationReceiptRecord.Type.BOOST)
+      else -> error("Unsupported position $position")
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt

@@ -0,0 +1,82 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.TextPreference
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.util.StickyHeaderDecoration
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+class DonationReceiptListPageFragment : Fragment(R.layout.donation_receipt_list_page_fragment) {
+
+  private val viewModel: DonationReceiptListPageViewModel by viewModels(factoryProducer = {
+    DonationReceiptListPageViewModel.Factory(type, DonationReceiptListPageRepository())
+  })
+
+  private val sharedViewModel: DonationReceiptListViewModel by viewModels(
+    ownerProducer = { requireParentFragment() },
+    factoryProducer = {
+      DonationReceiptListViewModel.Factory(DonationReceiptListRepository())
+    }
+  )
+
+  private val type: DonationReceiptRecord.Type?
+    get() = requireArguments().getString(ARG_TYPE)?.let { DonationReceiptRecord.Type.fromCode(it) }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val adapter = DonationReceiptListAdapter { model ->
+      findNavController().safeNavigate(DonationReceiptListFragmentDirections.actionDonationReceiptListFragmentToDonationReceiptDetailFragment(model.record.id))
+    }
+
+    view.findViewById<RecyclerView>(R.id.recycler).apply {
+      this.adapter = adapter
+      addItemDecoration(StickyHeaderDecoration(adapter, false, true, 0))
+    }
+
+    LiveDataUtil.combineLatest(
+      viewModel.state,
+      sharedViewModel.state
+    ) { records, badges ->
+      records.map { DonationReceiptListItem.Model(it, getBadgeForRecord(it, badges)) }
+    }.observe(viewLifecycleOwner) { records ->
+      adapter.submitList(
+        records +
+          TextPreference(
+            title = null,
+            summary = DSLSettingsText.from(
+              R.string.DonationReceiptListFragment__if_you_have,
+              DSLSettingsText.TextAppearanceModifier(R.style.TextAppearance_Signal_Subtitle)
+            )
+          )
+      )
+    }
+  }
+
+  private fun getBadgeForRecord(record: DonationReceiptRecord, badges: List<DonationReceiptBadge>): Badge? {
+    return when (record.type) {
+      DonationReceiptRecord.Type.BOOST -> badges.firstOrNull { it.type == DonationReceiptRecord.Type.BOOST }?.badge
+      else -> badges.firstOrNull { it.level == record.subscriptionLevel }?.badge
+    }
+  }
+
+  companion object {
+
+    private const val ARG_TYPE = "arg_type"
+
+    fun create(type: DonationReceiptRecord.Type?): Fragment {
+      return DonationReceiptListPageFragment().apply {
+        arguments = Bundle().apply {
+          putString(ARG_TYPE, type?.code)
+        }
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageRepository.kt

@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+class DonationReceiptListPageRepository {
+  fun getRecords(type: DonationReceiptRecord.Type?): Single<List<DonationReceiptRecord>> {
+    return Single.fromCallable {
+      SignalDatabase.donationReceipts.getReceipts(type)
+    }.subscribeOn(Schedulers.io())
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageViewModel.kt

@@ -0,0 +1,34 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+class DonationReceiptListPageViewModel(type: DonationReceiptRecord.Type?, repository: DonationReceiptListPageRepository) : ViewModel() {
+
+  private val disposables = CompositeDisposable()
+  private val internalState = MutableLiveData<List<DonationReceiptRecord>>()
+
+  val state: LiveData<List<DonationReceiptRecord>> = internalState
+
+  init {
+    disposables += repository.getRecords(type)
+      .subscribe { records ->
+        internalState.postValue(records)
+      }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+
+  class Factory(private val type: DonationReceiptRecord.Type?, private val repository: DonationReceiptListPageRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptListPageViewModel(type, repository)) as T
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt

@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import java.util.Locale
+
+class DonationReceiptListRepository {
+  fun getBadges(): Single<List<DonationReceiptBadge>> {
+    val boostBadges: Single<List<DonationReceiptBadge>> = ApplicationDependencies.getDonationsService().getBoostBadge(Locale.getDefault())
+      .map { response ->
+        if (response.result.isPresent) {
+          listOf(DonationReceiptBadge(DonationReceiptRecord.Type.BOOST, -1, Badges.fromServiceBadge(response.result.get())))
+        } else {
+          emptyList()
+        }
+      }
+
+    val subBadges: Single<List<DonationReceiptBadge>> = ApplicationDependencies.getDonationsService().getSubscriptionLevels(Locale.getDefault())
+      .map { response ->
+        if (response.result.isPresent) {
+          response.result.get().levels.map {
+            DonationReceiptBadge(
+              level = it.key.toInt(),
+              badge = Badges.fromServiceBadge(it.value.badge),
+              type = DonationReceiptRecord.Type.RECURRING
+            )
+          }
+        } else {
+          emptyList()
+        }
+      }
+
+    return boostBadges.zipWith(subBadges) { a, b -> a + b }.subscribeOn(Schedulers.io())
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListViewModel.kt

@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+
+class DonationReceiptListViewModel(private val repository: DonationReceiptListRepository) : ViewModel() {
+
+  private val disposables = CompositeDisposable()
+  private val internalState = MutableLiveData<List<DonationReceiptBadge>>(emptyList())
+  private var networkDisposable: Disposable
+
+  val state: LiveData<List<DonationReceiptBadge>> = internalState
+
+  init {
+    networkDisposable = InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retry()
+        }
+      }
+
+    refresh()
+  }
+
+  private fun retry() {
+    if (internalState.value?.isEmpty() == true) {
+      refresh()
+    }
+  }
+
+  private fun refresh() {
+    disposables.clear()
+    disposables += repository.getBadges().subscribe { badges ->
+      internalState.postValue(badges)
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+    networkDisposable.dispose()
+  }
+
+  class Factory(private val repository: DonationReceiptListRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptListViewModel(repository)) as T
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.subscribe
 
+import android.content.DialogInterface
 import android.graphics.Color
 import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
@@ -8,6 +9,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
@@ -20,22 +22,22 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationExceptions
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorDialogs
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.models.Progress
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.help.HelpFragment
-import org.thoughtcrime.securesms.keyboard.findListener
-import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.subscription.Subscription
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import java.util.Calendar
 import java.util.Currency
@@ -63,6 +65,8 @@ class SubscribeFragment : DSLSettingsFragment(
   private lateinit var processingDonationPaymentDialog: AlertDialog
   private lateinit var donationPaymentComponent: DonationPaymentComponent
 
+  private var errorDialog: DialogInterface? = null
+
   private val viewModel: SubscribeViewModel by viewModels(
     factoryProducer = {
       SubscribeViewModel.Factory(SubscriptionsRepository(ApplicationDependencies.getDonationsService()), donationPaymentComponent.donationPaymentRepository, FETCH_SUBSCRIPTION_TOKEN_REQUEST_CODE)
@@ -75,7 +79,7 @@ class SubscribeFragment : DSLSettingsFragment(
   }
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    donationPaymentComponent = findListener()!!
+    donationPaymentComponent = requireListener()
     viewModel.refresh()
 
     BadgePreview.register(adapter)
@@ -97,10 +101,7 @@ class SubscribeFragment : DSLSettingsFragment(
     lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
     lifecycleDisposable += viewModel.events.subscribe {
       when (it) {
-        is DonationEvent.GooglePayUnavailableError -> Unit
-        is DonationEvent.PaymentConfirmationError -> onPaymentError(it.throwable)
         is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed(it.badge)
-        is DonationEvent.RequestTokenError -> onPaymentError(DonationExceptions.SetupFailed(it.throwable))
         DonationEvent.RequestTokenSuccess -> Log.w(TAG, "Successfully got request token from Google Pay")
         DonationEvent.SubscriptionCancelled -> onSubscriptionCancelled()
         is DonationEvent.SubscriptionCancellationFailed -> onSubscriptionFailedToCancel(it.throwable)
@@ -109,6 +110,13 @@ class SubscribeFragment : DSLSettingsFragment(
     lifecycleDisposable += donationPaymentComponent.googlePayResultPublisher.subscribe {
       viewModel.onActivityResult(it.requestCode, it.resultCode, it.data)
     }
+
+    lifecycleDisposable += DonationError
+      .getErrorsForSource(DonationErrorSource.SUBSCRIPTION)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { donationError ->
+        onPaymentError(donationError)
+      }
   }
 
   override fun onDestroyView() {
@@ -277,49 +285,21 @@ class SubscribeFragment : DSLSettingsFragment(
   }
 
   private fun onPaymentError(throwable: Throwable?) {
-    if (throwable is DonationExceptions.TimedOutWaitingForTokenRedemption) {
-      Log.w(TAG, "Timeout occurred while redeeming token", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__still_processing)
-        .setMessage(R.string.DonationsErrors__your_payment_is_still)
-        .setPositiveButton(android.R.string.ok) { dialog, _ ->
-          dialog.dismiss()
-          requireActivity().finish()
-          requireActivity().startActivity(AppSettingsActivity.manageSubscriptions(requireContext()))
-        }
-        .show()
-    } else if (throwable is DonationExceptions.SetupFailed) {
-      Log.w(TAG, "Error occurred while processing payment", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__error_processing_payment)
-        .setMessage(R.string.DonationsErrors__your_payment)
-        .setPositiveButton(android.R.string.ok) { dialog, _ ->
-          dialog.dismiss()
-        }
-        .show()
-    } else if (SignalStore.donationsValues().shouldCancelSubscriptionBeforeNextSubscribeAttempt) {
-      Log.w(TAG, "Stripe failed to process payment", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__error_processing_payment)
-        .setMessage(R.string.DonationsErrors__your_badge_could_not_be_added)
-        .setPositiveButton(R.string.Subscription__contact_support) { dialog, _ ->
-          dialog.dismiss()
-          requireActivity().finish()
-          requireActivity().startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.DONATION_INDEX))
-        }
-        .show()
-    } else {
-      Log.w(TAG, "Error occurred while trying to redeem token", throwable, true)
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__couldnt_add_badge)
-        .setMessage(R.string.DonationsErrors__your_badge_could_not)
-        .setPositiveButton(R.string.Subscription__contact_support) { dialog, _ ->
-          dialog.dismiss()
-          requireActivity().finish()
-          requireActivity().startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.DONATION_INDEX))
-        }
-        .show()
+    Log.w(TAG, "onPaymentError", throwable, true)
+
+    if (errorDialog != null) {
+      Log.i(TAG, "Already displaying an error dialog. Skipping.")
+      return
     }
+
+    errorDialog = DonationErrorDialogs.show(
+      requireContext(), throwable,
+      object : DonationErrorDialogs.DialogCallback() {
+        override fun onDialogDismissed() {
+          findNavController().popBackStack()
+        }
+      }
+    )
   }
 
   private fun onSubscriptionCancelled() {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt

@@ -18,9 +18,11 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
 import org.signal.donations.GooglePayApi
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationExceptions
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
 import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.subscription.LevelUpdate
@@ -129,11 +131,6 @@ class SubscribeViewModel(
       onError = this::handleSubscriptionDataLoadFailure
     )
 
-    disposables += donationPaymentRepository.isGooglePayAvailable().subscribeBy(
-      onComplete = { store.update { it.copy(isGooglePayAvailable = true) } },
-      onError = { eventPublisher.onNext(DonationEvent.GooglePayUnavailableError(it)) }
-    )
-
     disposables += currency.subscribe { selection ->
       store.update { it.copy(currencySelection = selection) }
     }
@@ -170,6 +167,7 @@ class SubscribeViewModel(
           SignalStore.donationsValues().setLastEndOfPeriod(0L)
           SignalStore.donationsValues().clearLevelOperations()
           SignalStore.donationsValues().shouldCancelSubscriptionBeforeNextSubscribeAttempt = false
+          SignalStore.donationsValues().unexpectedSubscriptionCancelationReason = null
           MultiDeviceSubscriptionSyncRequestJob.enqueue()
         }
       } else {
@@ -186,6 +184,7 @@ class SubscribeViewModel(
         SignalStore.donationsValues().setLastEndOfPeriod(0L)
         SignalStore.donationsValues().clearLevelOperations()
         SignalStore.donationsValues().markUserManuallyCancelled()
+        SignalStore.donationsValues().unexpectedSubscriptionCancelationReason = null
         refreshActiveSubscription()
         MultiDeviceSubscriptionSyncRequestJob.enqueue()
         donationPaymentRepository.scheduleSyncForAccountRecordChange()
@@ -222,13 +221,20 @@ class SubscribeViewModel(
             val setup = ensureSubscriberId
               .andThen(cancelActiveSubscriptionIfNecessary())
               .andThen(continueSetup)
-              .onErrorResumeNext { Completable.error(DonationExceptions.SetupFailed(it)) }
+              .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it)) }
 
             setup.andThen(setLevel).subscribeBy(
               onError = { throwable ->
                 refreshActiveSubscription()
                 store.update { it.copy(stage = SubscribeState.Stage.READY) }
-                eventPublisher.onNext(DonationEvent.PaymentConfirmationError(throwable))
+
+                val donationError: DonationError = if (throwable is DonationError) {
+                  throwable
+                } else {
+                  Log.w(TAG, "Failed to complete payment or redemption", throwable, true)
+                  DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION)
+                }
+                DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError)
               },
               onComplete = {
                 store.update { it.copy(stage = SubscribeState.Stage.READY) }
@@ -242,7 +248,7 @@ class SubscribeViewModel(
 
         override fun onError(googlePayException: GooglePayApi.GooglePayException) {
           store.update { it.copy(stage = SubscribeState.Stage.READY) }
-          eventPublisher.onNext(DonationEvent.RequestTokenError(googlePayException))
+          DonationError.routeDonationError(ApplicationDependencies.getApplication(), DonationError.getGooglePayRequestTokenError(DonationErrorSource.SUBSCRIPTION, googlePayException))
         }
 
         override fun onCancelled() {
@@ -262,7 +268,13 @@ class SubscribeViewModel(
         },
         onError = { throwable ->
           store.update { it.copy(stage = SubscribeState.Stage.READY) }
-          eventPublisher.onNext(DonationEvent.PaymentConfirmationError(throwable))
+          val donationError: DonationError = if (throwable is DonationError) {
+            throwable
+          } else {
+            Log.w(TAG, "Failed to complete payment or redemption", throwable, true)
+            DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION)
+          }
+          DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError)
         }
       )
   }

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

@@ -18,6 +18,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.doOnPreDraw
 import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import app.cash.exhaustive.Exhaustive
 import com.google.android.flexbox.FlexboxLayoutManager
@@ -92,8 +93,7 @@ private const val REQUEST_CODE_RETURN_FROM_MEDIA = 4
 
 class ConversationSettingsFragment : DSLSettingsFragment(
   layoutId = R.layout.conversation_settings_fragment,
-  menuId = R.menu.conversation_settings,
-  layoutManagerProducer = Badges::createLayoutManagerForGridWithBadges
+  menuId = R.menu.conversation_settings
 ) {
 
   private val alertTint by lazy { ContextCompat.getColor(requireContext(), R.color.signal_alert_primary) }
@@ -151,6 +151,11 @@ class ConversationSettingsFragment : DSLSettingsFragment(
     toolbarTitle = view.findViewById(R.id.toolbar_title)
     toolbarBackground = view.findViewById(R.id.toolbar_background)
 
+    val args: ConversationSettingsFragmentArgs = ConversationSettingsFragmentArgs.fromBundle(requireArguments())
+    if (args.recipientId != null) {
+      layoutManagerProducer = Badges::createLayoutManagerForGridWithBadges
+    }
+
     super.onViewCreated(view, savedInstanceState)
   }
 
@@ -261,8 +266,12 @@ class ConversationSettingsFragment : DSLSettingsFragment(
       customPref(
         AvatarPreference.Model(
           recipient = state.recipient,
+          storyViewState = state.storyViewState,
           onAvatarClick = { avatar ->
             if (!state.recipient.isSelf) {
+              // startActivity(StoryViewerActivity.createIntent(requireContext(), state.recipient.id))
+
+              // TODO [stories] -- If recipient has a story, go to story viewer.
               requireActivity().apply {
                 startActivity(
                   AvatarPreviewActivity.intentFromRecipientId(this, state.recipient.id),
@@ -762,9 +771,14 @@ class ConversationSettingsFragment : DSLSettingsFragment(
     private val rect = Rect()
 
     override fun getAnimationState(recyclerView: RecyclerView): AnimationState {
-      val layoutManager = recyclerView.layoutManager as FlexboxLayoutManager
+      val layoutManager = recyclerView.layoutManager!!
+      val firstVisibleItemPosition = if (layoutManager is FlexboxLayoutManager) {
+        layoutManager.findFirstVisibleItemPosition()
+      } else {
+        (layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
+      }
 
-      return if (layoutManager.findFirstVisibleItemPosition() == 0) {
+      return if (firstVisibleItemPosition == 0) {
         val firstChild = requireNotNull(layoutManager.getChildAt(0))
         firstChild.getLocalVisibleRect(rect)
 

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

@@ -4,6 +4,8 @@ import android.content.Context
 import android.database.Cursor
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
@@ -13,6 +15,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase
 import org.thoughtcrime.securesms.database.MediaDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.IdentityRecord
+import org.thoughtcrime.securesms.database.model.StoryViewState
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupManager
@@ -44,6 +47,14 @@ class ConversationSettingsRepository(
     }
   }
 
+  fun getStoryViewState(groupId: GroupId): Observable<StoryViewState> {
+    return Observable.fromCallable {
+      SignalDatabase.recipients.getByGroupId(groupId)
+    }.flatMap {
+      StoryViewState.getForRecipientId(it.get())
+    }.observeOn(Schedulers.io())
+  }
+
   fun getThreadId(recipientId: RecipientId, consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       consumer(SignalDatabase.threads.getThreadIdIfExistsFor(recipientId))
@@ -65,7 +76,11 @@ class ConversationSettingsRepository(
 
   fun getIdentity(recipientId: RecipientId, consumer: (IdentityRecord?) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orNull())
+      if (SignalStore.account().aci != null && SignalStore.account().pni != null) {
+        consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orNull())
+      } else {
+        consumer(null)
+      }
     }
   }
 

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

@@ -4,12 +4,14 @@ import android.database.Cursor
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.ButtonStripPreference
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.LegacyGroupPreference
 import org.thoughtcrime.securesms.database.model.IdentityRecord
+import org.thoughtcrime.securesms.database.model.StoryViewState
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry
 import org.thoughtcrime.securesms.recipients.Recipient
 
 data class ConversationSettingsState(
   val threadId: Long = -1,
+  val storyViewState: StoryViewState = StoryViewState.NONE,
   val recipient: Recipient = Recipient.UNKNOWN,
   val buttonStripState: ButtonStripPreference.State = ButtonStripPreference.State(),
   val disappearingMessagesLifespan: Int = 0,