Bump version to 6.3.2

Fixes #12579

README.md

@@ -1,10 +1,10 @@
 # Signal Android 
 
-Signal is a messaging app for simple private communication with friends.
+Signal is a simple, powerful, and secure messenger.
 
-Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.
+Signal uses your phone's data connection (WiFi/3G/4G/5G) to communicate securely. Millions of people use Signal every day for free and instantaneous communication anywhere in the world. Send and receive high-fidelity messages, participate in HD voice/video calls, and explore a growing set of new features that help you stay connected. Signal’s advanced privacy-preserving technology is always enabled, so you can focus on sharing the moments that matter with the people who matter to you.
 
-Currently available on the Play store and [signal.org](https://signal.org/android/apk/).
+Currently available on the Play Store and [signal.org](https://signal.org/android/apk/).
 
 <a href='https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80px'/></a>
 
@@ -18,7 +18,7 @@ Want to live life on the bleeding edge and help out with testing?
 
 You can subscribe to Signal Android Beta releases here:
 https://play.google.com/apps/testing/org.thoughtcrime.securesms
- 
+
 If you're interested in a life of peace and tranquility, stick with the standard releases.
 
 ## Contributing Code
@@ -28,7 +28,7 @@ If you're new to the Signal codebase, we recommend going through our issues and
 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.
 
 ## Contributing Ideas
-Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
+Have something you want to say about Signal projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
 
 Help
 ====

app/build.gradle

@@ -50,8 +50,8 @@ ktlint {
     version = "0.43.2"
 }
 
-def canonicalVersionCode = 1152
-def canonicalVersionName = "6.0.2"
+def canonicalVersionCode = 1167
+def canonicalVersionName = "6.3.2"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -538,6 +538,7 @@ dependencies {
         force = true
     }
     testImplementation testLibs.hamcrest.hamcrest
+    testImplementation testLibs.mockk
 
     testImplementation(testFixtures(project(":libsignal-service")))
 

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt

@@ -0,0 +1,170 @@
+package org.thoughtcrime.securesms.conversation
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.ThreadUtil
+import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
+import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import java.util.Optional
+
+/**
+ * Helper test for rendering conversation items for preview.
+ */
+@RunWith(AndroidJUnit4::class)
+@Ignore("For testing/previewing manually, no assertions")
+class ConversationItemPreviewer {
+
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 10)
+
+  @Test
+  fun testShowLongName() {
+    val other: Recipient = Recipient.resolved(harness.others.first())
+
+    SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Seef", "$$$"))
+
+    insertFailedMediaMessage(other = other, attachmentCount = 1)
+    insertFailedMediaMessage(other = other, attachmentCount = 2)
+    insertFailedMediaMessage(other = other, body = "Test", attachmentCount = 1)
+//    insertFailedOutgoingMediaMessage(other = other, body = "Test", attachmentCount = 1)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+
+    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
+    scenario.onActivity {
+    }
+
+    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
+//    ThreadUtil.sleep(45000)
+  }
+
+  private fun insertMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = System.currentTimeMillis(),
+      serverTimeMillis = System.currentTimeMillis(),
+      receivedTimeMillis = System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+    )
+
+    SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun insertFailedMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = System.currentTimeMillis(),
+      serverTimeMillis = System.currentTimeMillis(),
+      receivedTimeMillis = System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+    )
+
+    val insert = SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+
+    SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
+//      if (index != 1) {
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert.messageId)
+//      } else {
+//        SignalDatabase.attachments.setTransferState(insert.messageId, attachment, TRANSFER_PROGRESS_STARTED)
+//      }
+    }
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun insertFailedOutgoingMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = OutgoingMediaMessage(
+      other,
+      body,
+      PointerAttachment.forPointers(Optional.of(attachments)),
+      System.currentTimeMillis(),
+      -1,
+      0,
+      false,
+      ThreadDatabase.DistributionTypes.DEFAULT,
+      StoryType.NONE,
+      null,
+      false,
+      null,
+      emptyList(),
+      emptyList(),
+      emptyList(),
+      emptySet(),
+      emptySet(),
+      null
+    )
+
+    val insert = SignalDatabase.mms.insertMessageOutbox(
+      OutgoingSecureMediaMessage(message),
+      SignalDatabase.threads.getOrCreateThreadIdFor(other),
+      false,
+      null
+    )
+
+    SignalDatabase.attachments.getAttachmentsForMessage(insert).forEachIndexed { index, attachment ->
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert)
+    }
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun attachment(): SignalServiceAttachmentPointer {
+    return SignalServiceAttachmentPointer(
+      ReleaseChannel.CDN_NUMBER,
+      SignalServiceAttachmentRemoteId.from(""),
+      "image/webp",
+      null,
+      Optional.empty(),
+      Optional.empty(),
+      1024,
+      1024,
+      Optional.empty(),
+      Optional.of("/not-there.jpg"),
+      false,
+      false,
+      false,
+      Optional.empty(),
+      Optional.empty(),
+      System.currentTimeMillis()
+    )
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation
 
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -19,6 +20,7 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
 /**
  * Android test to help show SNC dialog quickly with custom data to make sure it displays properly.
  */
+@Ignore("For testing/previewing manually, no assertions")
 @RunWith(AndroidJUnit4::class)
 class SafetyNumberChangeDialogPreviewer {
 

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

@@ -291,7 +291,7 @@ class MmsDatabaseTest_stories {
   }
 
   @Test
-  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
+  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
     // GIVEN
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
@@ -312,7 +312,7 @@ class MmsDatabaseTest_stories {
     val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
 
     // THEN
-    assertFalse(result)
+    assertTrue(result)
   }
 
   @Test

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

@@ -1,457 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireString
-import org.signal.core.util.select
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processPnpTuple {
-
-  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)
-  }
-
-  @Test
-  fun noMatch_e164Only() {
-    test {
-      process(E164_A, null, null)
-      expect(E164_A, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_e164AndPni() {
-    test {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun noMatch_aciOnly() {
-    test {
-      process(null, null, ACI_A)
-      expect(null, null, ACI_A)
-    }
-  }
-
-  @Test(expected = IllegalStateException::class)
-  fun noMatch_noData() {
-    test {
-      process(null, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_allFields() {
-    test {
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun fullMatch() {
-    test {
-      given(E164_A, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches() {
-    test {
-      given(E164_A, null, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_differentAci() {
-    test {
-      given(E164_A, null, ACI_B)
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(null, null, ACI_B)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndAciMatches() {
-    test {
-      given(E164_A, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches() {
-    test {
-      given(null, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches() {
-    test {
-      given(null, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_pniChanges_noAciProvided_noPniSession() {
-    test {
-      given(E164_A, PNI_B, null)
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches_noExistingSession() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingSession() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingPniSession_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_B, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciOnly() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciProvidedButNoAciRecord() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniAndE164_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPni_noAciProvided_noSessions() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly() {
-    test {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164() {
-    test {
-      given(E164_B, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_B, null, null)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPniAndAci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, PNI_B, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164Aci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
-    val id: Long = SignalDatabase.rawDatabase.insert(
-      RecipientDatabase.TABLE_NAME,
-      null,
-      contentValuesOf(
-        RecipientDatabase.PHONE to e164,
-        RecipientDatabase.SERVICE_ID to (aci ?: pni)?.toString(),
-        RecipientDatabase.PNI_COLUMN to pni?.toString(),
-        RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id
-      )
-    )
-
-    return RecipientId.from(id)
-  }
-
-  private fun require(id: RecipientId): IdRecord {
-    return get(id)!!
-  }
-
-  private fun get(id: RecipientId): IdRecord? {
-    SignalDatabase.rawDatabase
-      .select(RecipientDatabase.ID, RecipientDatabase.PHONE, RecipientDatabase.SERVICE_ID, RecipientDatabase.PNI_COLUMN)
-      .from(RecipientDatabase.TABLE_NAME)
-      .where("${RecipientDatabase.ID} = ?", id)
-      .run()
-      .use { cursor ->
-        return if (cursor.moveToFirst()) {
-          IdRecord(
-            id = RecipientId.from(cursor.requireLong(RecipientDatabase.ID)),
-            e164 = cursor.requireString(RecipientDatabase.PHONE),
-            sid = ServiceId.parseOrNull(cursor.requireString(RecipientDatabase.SERVICE_ID)),
-            pni = PNI.parseOrNull(cursor.requireString(RecipientDatabase.PNI_COLUMN))
-          )
-        } else {
-          null
-        }
-      }
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME} WHERE ${RecipientDatabase.DISTRIBUTION_LIST_ID} IS NULL ", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  /**
-   * Baby DSL for making tests readable.
-   */
-  private fun test(init: TestCase.() -> Unit): TestCase {
-    val test = TestCase()
-    test.init()
-    return test
-  }
-
-  private inner class TestCase {
-    private val generatedIds: LinkedHashSet<RecipientId> = LinkedHashSet()
-    private var expectCount = 0
-
-    fun given(e164: String?, pni: PNI?, aci: ACI?) {
-      generatedIds += insert(e164, pni, aci)
-    }
-
-    fun process(e164: String?, pni: PNI?, aci: ACI?) {
-      SignalDatabase.rawDatabase.beginTransaction()
-      try {
-        generatedIds += recipientDatabase.processPnpTuple(e164, pni, aci, pniVerified = false).finalId
-        SignalDatabase.rawDatabase.setTransactionSuccessful()
-      } finally {
-        SignalDatabase.rawDatabase.endTransaction()
-      }
-    }
-
-    fun expect(e164: String?, pni: PNI?, aci: ACI?) {
-      expect(generatedIds.elementAt(expectCount++), e164, pni, aci)
-    }
-
-    fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val record: IdRecord = require(id)
-      assertEquals(e164, record.e164)
-      assertEquals(pni, record.pni)
-      assertEquals(aci ?: pni, record.sid)
-    }
-
-    fun expectDeleted() {
-      expectDeleted(generatedIds.elementAt(expectCount++))
-    }
-
-    fun expectDeleted(id: RecipientId) {
-      assertNull(get(id))
-    }
-  }
-
-  private data class IdRecord(
-    val id: RecipientId,
-    val e164: String?,
-    val sid: ServiceId?,
-    val pni: PNI?,
-  )
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
-
-    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt

@@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.KbsEnclave
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.push.SignalServiceTrustStore
+import org.thoughtcrime.securesms.recipients.LiveRecipientCache
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
 import org.thoughtcrime.securesms.util.Base64
@@ -41,6 +42,7 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
   private val keyBackupService: KeyBackupService
+  private val recipientCache: LiveRecipientCache
 
   init {
     runSync {
@@ -81,6 +83,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     }
 
     keyBackupService = mock()
+
+    recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
   override fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess {
@@ -91,6 +95,10 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     return keyBackupService
   }
 
+  override fun provideRecipientCache(): LiveRecipientCache {
+    return recipientCache
+  }
+
   companion object {
     lateinit var webServer: MockWebServer
       private set

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.messages
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Rule
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.ExceptionMetadata
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.MessageState
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+abstract class MessageContentProcessorTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  protected fun MessageContentProcessor.doProcess(
+    messageState: MessageState = MessageState.DECRYPTED_OK,
+    content: SignalServiceContent,
+    exceptionMetadata: ExceptionMetadata = ExceptionMetadata("sender", 1),
+    timestamp: Long = 100L,
+    smsMessageId: Long = -1L
+  ) {
+    process(messageState, content, exceptionMetadata, timestamp, smsMessageId)
+  }
+
+  protected fun createNormalContentTestSubject(): MessageContentProcessor {
+    val context = ApplicationProvider.getApplicationContext<Application>()
+
+    return MessageContentProcessor.forNormalContent(context)
+  }
+
+  /**
+   * Creates a valid ServiceContentProto with a data message which can be built via
+   * `injectDataMessage`. This function is intended to be built on-top of for more
+   * specific scenario in subclasses.
+   *
+   * Example can be seen in __handleStoryMessageTest
+   */
+  protected fun createServiceContentWithDataMessage(
+    messageSender: Recipient = Recipient.resolved(harness.others.first()),
+    injectDataMessage: SignalServiceProtos.DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return TestProtos.build {
+      serviceContent(
+        localAddress = address(uuid = harness.self.requireServiceId().uuid()).build(),
+        metadata = metadata(
+          address = address(uuid = messageSender.requireServiceId().uuid()).build()
+        ).build()
+      ).apply {
+        content = content().apply {
+          dataMessage = dataMessage().apply {
+            injectDataMessage()
+          }.build()
+        }.build()
+      }.build()
+    }
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt

@@ -0,0 +1,181 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.signal.core.util.requireLong
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.database.MessageDatabase
+import org.thoughtcrime.securesms.database.MmsHelper
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import kotlin.random.Random
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorTest() {
+
+  @Before
+  fun setUp() {
+    SignalDatabase.mms.deleteAllThreads()
+  }
+
+  @After
+  fun tearDown() {
+    SignalDatabase.mms.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithADirectStoryReplyWhenIProcessThenIInsertAReplyInTheCorrectThread() {
+    val sender = Recipient.resolved(harness.others.first())
+    val senderThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(sender)
+    val myStory = Recipient.resolved(SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!)
+    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+    val expectedSentTime = 200L
+    val storyMessageId = MmsHelper.insert(
+      sentTimeMillis = expectedSentTime,
+      recipient = myStory,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = myStoryThread
+    )
+
+    SignalDatabase.storySends.insert(
+      messageId = storyMessageId,
+      recipientIds = listOf(sender.id),
+      sentTimestamp = expectedSentTime,
+      allowsReplies = true,
+      distributionId = DistributionId.MY_STORY
+    )
+
+    val expectedBody = "Hello!"
+
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = harness.self,
+      storySentTimestamp = expectedSentTime
+    ) {
+      body = expectedBody
+    }
+
+    runTestWithContent(contentProto = storyContent)
+
+    val replyId = SignalDatabase.mmsSms.getConversation(senderThreadId, 0, 1).use {
+      it.moveToFirst()
+      it.requireLong(MessageDatabase.ID)
+    }
+
+    val replyRecord = SignalDatabase.mms.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.DirectReply(storyMessageId).serialize(), replyRecord.parentStoryId!!.serialize())
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.mms.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithAGroupStoryReplyWhenIProcessThenIInsertAReplyToTheCorrectStory() {
+    val sender = Recipient.resolved(harness.others[0])
+    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(
+        listOf(
+          DecryptedMember.newBuilder()
+            .setUuid(harness.self.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build(),
+          DecryptedMember.newBuilder()
+            .setUuid(sender.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build()
+        )
+      )
+      .setRevision(0)
+      .build()
+
+    val group = SignalDatabase.groups.create(
+      groupMasterKey,
+      decryptedGroupState
+    )
+
+    val groupRecipient = Recipient.externalGroupExact(group)
+    val threadForGroup = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+
+    val insertResult = MmsHelper.insert(
+      message = IncomingMediaMessage(
+        from = sender.id,
+        sentTimeMillis = 100L,
+        serverTimeMillis = 101L,
+        receivedTimeMillis = 102L,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      threadId = threadForGroup
+    )
+
+    val expectedBody = "Hello, World!"
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = sender,
+      storySentTimestamp = 100L
+    ) {
+      groupV2 = TestProtos.build { groupContextV2(masterKeyBytes = groupMasterKey.serialize()).build() }
+      body = expectedBody
+    }
+
+    runTestWithContent(storyContent)
+
+    val replyId = SignalDatabase.mms.getStoryReplies(insertResult.get().messageId).use { cursor ->
+      assertEquals(1, cursor.count)
+      cursor.moveToFirst()
+      cursor.requireLong(MessageDatabase.ID)
+    }
+
+    val replyRecord = SignalDatabase.mms.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.GroupReply(insertResult.get().messageId).serialize(), replyRecord.parentStoryId?.serialize())
+    assertEquals(threadForGroup, replyRecord.threadId)
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.mms.deleteGroupStoryReplies(insertResult.get().messageId)
+    SignalDatabase.mms.deleteAllThreads()
+  }
+
+  /**
+   * Creates a ServiceContent proto with a StoryContext, and then
+   * uses `injectDataMessage` to fill in the data message object.
+   */
+  private fun createServiceContentWithStoryContext(
+    messageSender: Recipient,
+    storyAuthor: Recipient,
+    storySentTimestamp: Long,
+    injectDataMessage: DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return createServiceContentWithDataMessage(messageSender) {
+      storyContext = TestProtos.build {
+        storyContext(
+          sentTimestamp = storySentTimestamp,
+          authorUuid = storyAuthor.requireServiceId().toString()
+        ).build()
+      }
+      injectDataMessage()
+    }
+  }
+
+  private fun runTestWithContent(contentProto: SignalServiceContentProto) {
+    val content = SignalServiceContent.createFromProto(contentProto)
+    val testSubject = createNormalContentTestSubject()
+    testSubject.doProcess(content = content)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt

@@ -0,0 +1,33 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleTextMessageTest : MessageContentProcessorTest() {
+  @Test
+  fun givenContentWithATextMessageWhenIProcessThenIInsertTheTextMessage() {
+    val testSubject: MessageContentProcessor = createNormalContentTestSubject()
+    val expectedBody = "Hello, World!"
+    val contentProto: SignalServiceContentProto = createServiceContentWithDataMessage {
+      body = expectedBody
+    }
+
+    val content = SignalServiceContent.createFromProto(contentProto)
+
+    // WHEN
+    testSubject.doProcess(content = content)
+
+    // THEN
+    val record = SignalDatabase.sms.getMessageRecord(1)
+    val threadSize = SignalDatabase.mmsSms.getConversationCount(record.threadId)
+    assertEquals(1, threadSize)
+
+    assertTrue(record.isSecure)
+    assertEquals(expectedBody, record.body)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt

@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.reactivex.rxjava3.schedulers.TestScheduler
 import okhttp3.mockwebserver.MockResponse
 import org.junit.After
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -89,6 +90,7 @@ class UsernameEditFragmentTest {
     onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
   }
 
+  @Ignore("Flakey espresso test.")
   @Test
   fun testNicknameUpdateHappyPath() {
     val nickname = "Spiderman"

app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt

@@ -110,6 +110,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
       SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
       SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
+      SignalDatabase.recipients.markRegistered(recipientId, aci)
       ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
       others += recipientId
     }

app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt

@@ -0,0 +1,70 @@
+package org.thoughtcrime.securesms.testing
+
+import com.google.protobuf.ByteString
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
+import org.whispersystems.signalservice.internal.serialize.protos.AddressProto
+import org.whispersystems.signalservice.internal.serialize.protos.MetadataProto
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import java.util.UUID
+import kotlin.random.Random
+
+class TestProtos private constructor() {
+  fun address(
+    uuid: UUID = UUID.randomUUID()
+  ): AddressProto.Builder {
+    return AddressProto.newBuilder()
+      .setUuid(ServiceId.from(uuid).toByteString())
+  }
+
+  fun metadata(
+    address: AddressProto = address().build(),
+  ): MetadataProto.Builder {
+    return MetadataProto.newBuilder()
+      .setAddress(address)
+  }
+
+  fun groupContextV2(
+    revision: Int = 0,
+    masterKeyBytes: ByteArray = Random.Default.nextBytes(GroupMasterKey.SIZE)
+  ): GroupContextV2.Builder {
+    return GroupContextV2.newBuilder()
+      .setRevision(revision)
+      .setMasterKey(ByteString.copyFrom(masterKeyBytes))
+  }
+
+  fun storyContext(
+    sentTimestamp: Long = Random.nextLong(),
+    authorUuid: String = UUID.randomUUID().toString()
+  ): DataMessage.StoryContext.Builder {
+    return DataMessage.StoryContext.newBuilder()
+      .setAuthorUuid(authorUuid)
+      .setSentTimestamp(sentTimestamp)
+  }
+
+  fun dataMessage(): DataMessage.Builder {
+    return DataMessage.newBuilder()
+  }
+
+  fun content(): SignalServiceProtos.Content.Builder {
+    return SignalServiceProtos.Content.newBuilder()
+  }
+
+  fun serviceContent(
+    localAddress: AddressProto = address().build(),
+    metadata: MetadataProto = metadata().build()
+  ): SignalServiceContentProto.Builder {
+    return SignalServiceContentProto.newBuilder()
+      .setLocalAddress(localAddress)
+      .setMetadata(metadata)
+  }
+
+  companion object {
+    fun <T> build(buildFn: TestProtos.() -> T): T {
+      return TestProtos().buildFn()
+    }
+  }
+}

app/src/main/AndroidManifest.xml

@@ -495,10 +495,12 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".MediaPreviewActivity"
+    <activity android:name=".mediapreview.MediaPreviewV2Activity"
               android:label="@string/AndroidManifest__media_preview"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".AvatarPreviewActivity"
@@ -694,9 +696,9 @@
               android:screenOrientation="portrait"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".mediapreview.MediaPreviewV2Activity"
-              android:exported="false"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+    <activity android:name=".components.settings.app.subscription.donate.DonateToSignalActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
     <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>

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

@@ -15,12 +15,13 @@ public final class AppCapabilities {
   private static final boolean ANNOUNCEMENT_GROUPS = true;
   private static final boolean SENDER_KEY          = true;
   private static final boolean CHANGE_NUMBER       = true;
+  private static final boolean STORIES             = true;
 
   /**
    * @param storageCapable Whether or not the user can use storage service. This is another way of
    *                       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, Stories.isFeatureFlagEnabled(), FeatureFlags.giftBadgeReceiveSupport(), FeatureFlags.phoneNumberPrivacy());
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, STORIES, FeatureFlags.giftBadgeReceiveSupport(), FeatureFlags.phoneNumberPrivacy());
   }
 }

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

@@ -104,6 +104,8 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onBlockJoinRequest(@NonNull Recipient recipient);
     void onRecipientNameClicked(@NonNull RecipientId target);
     void onInviteToSignalClicked();
+    void onActivatePaymentsClicked();
+    void onSendPaymentClicked(@NonNull RecipientId recipientId);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

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

@@ -356,6 +356,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
     return view;
   }
 
+  @Override
+  public void onDestroyView() {
+    super.onDestroyView();
+    constraintLayout = null;
+  }
+
   private @NonNull Bundle safeArguments() {
     return getArguments() != null ? getArguments() : new Bundle();
   }

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

@@ -1,869 +0,0 @@
-/*
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.app.ShareCompat;
-import androidx.core.util.Pair;
-import androidx.core.view.ViewCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.animation.DepthPageTransformer;
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener;
-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment;
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs;
-import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
-import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
-import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
-import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewViewModel;
-import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.AttachmentUtil;
-import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.FullscreenHelper;
-import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
-import org.thoughtcrime.securesms.util.StorageUtil;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Activity for displaying media attachments in-app
- */
-public final class MediaPreviewActivity extends PassphraseRequiredActivity
-  implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
-             MediaRailAdapter.RailItemListener,
-             MediaPreviewFragment.Events,
-             VoiceNoteMediaControllerOwner
-{
-
-  private final static String TAG = Log.tag(MediaPreviewActivity.class);
-
-  private ViewPager             mediaPager;
-  private View                  detailsContainer;
-  private TextView              caption;
-  private View                  captionContainer;
-  private RecyclerView          albumRail;
-  private MediaRailAdapter      albumRailAdapter;
-  private ViewGroup             playbackControlsContainer;
-  private Uri                   initialMediaUri;
-  private String                initialMediaType;
-  private long                  initialMediaSize;
-  private String                initialCaption;
-  private boolean               initialMediaIsVideoGif;
-  private boolean               leftIsRecent;
-  private MediaPreviewViewModel viewModel;
-  private ViewPagerListener     viewPagerListener;
-
-  private int                   restartItem      = -1;
-  private long                  threadId         = MediaIntentFactory.NOT_IN_A_THREAD;
-  private boolean               cameFromAllMedia;
-  private boolean               showThread;
-  private MediaDatabase.Sorting sorting;
-  private FullscreenHelper      fullscreenHelper;
-
-  private VoiceNoteMediaController voiceNoteMediaController;
-
-  private @Nullable Cursor cursor = null;
-
-  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
-                                                      @NonNull MediaRecord mediaRecord,
-                                                      boolean leftIsRecent)
-  {
-    DatabaseAttachment attachment = Objects.requireNonNull(mediaRecord.getAttachment());
-    Intent intent = new Intent(context, MediaPreviewActivity.class);
-    intent.putExtra(MediaIntentFactory.THREAD_ID_EXTRA, mediaRecord.getThreadId());
-    intent.putExtra(MediaIntentFactory.DATE_EXTRA, mediaRecord.getDate());
-    intent.putExtra(MediaIntentFactory.SIZE_EXTRA, attachment.getSize());
-    intent.putExtra(MediaIntentFactory.CAPTION_EXTRA, attachment.getCaption());
-    intent.putExtra(MediaIntentFactory.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.putExtra(MediaIntentFactory.IS_VIDEO_GIF, attachment.isVideoGif());
-    intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
-    return intent;
-  }
-
-  @Override
-  protected void attachBaseContext(@NonNull Context newBase) {
-    getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-    super.attachBaseContext(newBase);
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  @Override
-  protected void onCreate(Bundle bundle, boolean ready) {
-    this.setTheme(R.style.TextSecure_MediaPreview);
-    setContentView(R.layout.media_preview_activity);
-
-    setSupportActionBar(findViewById(R.id.toolbar));
-
-    voiceNoteMediaController = new VoiceNoteMediaController(this);
-    viewModel = new ViewModelProvider(this).get(MediaPreviewViewModel.class);
-
-    fullscreenHelper = new FullscreenHelper(this);
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    initializeViews();
-    initializeResources();
-    initializeObservers();
-  }
-
-  @SuppressLint("MissingSuperCall")
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  @Override
-  public void onRailItemClicked(int distanceFromActive) {
-    mediaPager.setCurrentItem(mediaPager.getCurrentItem() + distanceFromActive);
-  }
-
-  @Override
-  public void onRailItemDeleteClicked(int distanceFromActive) {
-    throw new UnsupportedOperationException("Callback unsupported.");
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  private void initializeActionBar() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      getSupportActionBar().setTitle(getTitleText(mediaItem));
-      getSupportActionBar().setSubtitle(getSubTitleText(mediaItem));
-    }
-  }
-
-  private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
-    String from;
-    if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
-    else if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
-    else                                  from = "";
-
-    if (showThread) {
-      String    titleText       = null;
-      Recipient threadRecipient = mediaItem.threadRecipient;
-
-      if (threadRecipient != null) {
-        if (mediaItem.outgoing) {
-          if (threadRecipient.isSelf()) {
-            titleText = getString(R.string.note_to_self);
-          } else {
-            titleText = getString(R.string.MediaPreviewActivity_you_to_s, threadRecipient.getDisplayName(this));
-          }
-        } else {
-          if (threadRecipient.isGroup()) {
-            titleText = getString(R.string.MediaPreviewActivity_s_to_s, from, threadRecipient.getDisplayName(this));
-          } else {
-            titleText = getString(R.string.MediaPreviewActivity_s_to_you, from);
-          }
-        }
-      }
-      return titleText != null ? titleText : from;
-    } else {
-      return from;
-    }
-  }
-
-  private @NonNull String getSubTitleText(@NonNull MediaItem mediaItem) {
-    if (mediaItem.date > 0) {
-      return DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
-    } else {
-      return getString(R.string.MediaPreviewActivity_draft);
-    }
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    initializeMedia();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    restartItem = cleanupMedia();
-  }
-
-  @Override
-  protected void onDestroy() {
-    if (cursor != null) {
-      cursor.close();
-      cursor = null;
-    }
-    super.onDestroy();
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    setIntent(intent);
-    initializeResources();
-  }
-
-  private void initializeViews() {
-    mediaPager = findViewById(R.id.media_pager);
-    mediaPager.setOffscreenPageLimit(1);
-    mediaPager.setPageTransformer(true, new DepthPageTransformer());
-
-    viewPagerListener = new ViewPagerListener();
-    mediaPager.addOnPageChangeListener(viewPagerListener);
-
-    albumRail        = findViewById(R.id.media_preview_album_rail);
-    albumRailAdapter = new MediaRailAdapter(GlideApp.with(this), this, false);
-
-    albumRail.setItemAnimator(null); // Or can crash when set to INVISIBLE while animating by FullscreenHelper https://issuetracker.google.com/issues/148720682
-    albumRail.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
-    albumRail.setAdapter(albumRailAdapter);
-
-    detailsContainer          = findViewById(R.id.media_preview_details_container);
-    caption                   = findViewById(R.id.media_preview_caption);
-    captionContainer          = findViewById(R.id.media_preview_caption_container);
-    playbackControlsContainer = findViewById(R.id.media_preview_playback_controls_container);
-
-    View toolbarLayout = findViewById(R.id.toolbar_layout);
-
-    anchorMarginsToBottomInsets(detailsContainer);
-
-    fullscreenHelper.configureToolbarLayout(findViewById(R.id.toolbar_cutout_spacer), findViewById(R.id.toolbar));
-
-    fullscreenHelper.showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
-  }
-
-  private void initializeResources() {
-    Intent intent = getIntent();
-
-    threadId         = intent.getLongExtra(MediaIntentFactory.THREAD_ID_EXTRA, MediaIntentFactory.NOT_IN_A_THREAD);
-    cameFromAllMedia = intent.getBooleanExtra(MediaIntentFactory.HIDE_ALL_MEDIA_EXTRA, false);
-    showThread       = intent.getBooleanExtra(MediaIntentFactory.SHOW_THREAD_EXTRA, false);
-    sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(MediaIntentFactory.SORTING_EXTRA, 0)];
-
-    initialMediaUri        = intent.getData();
-    initialMediaType       = intent.getType();
-    initialMediaSize       = intent.getLongExtra(MediaIntentFactory.SIZE_EXTRA, 0);
-    initialCaption         = intent.getStringExtra(MediaIntentFactory.CAPTION_EXTRA);
-    leftIsRecent           = intent.getBooleanExtra(MediaIntentFactory.LEFT_IS_RECENT_EXTRA, false);
-    initialMediaIsVideoGif = intent.getBooleanExtra(MediaIntentFactory.IS_VIDEO_GIF, false);
-    restartItem            = -1;
-  }
-
-  private void initializeObservers() {
-    viewModel.getPreviewData().observe(this, previewData -> {
-      if (previewData == null || mediaPager == null || mediaPager.getAdapter() == null) {
-        return;
-      }
-
-      if (!((MediaItemAdapter) mediaPager.getAdapter()).hasFragmentFor(mediaPager.getCurrentItem())) {
-        Log.d(TAG, "MediaItemAdapter wasn't ready. Posting again...");
-        viewModel.resubmitPreviewData();
-      }
-
-      View playbackControls = ((MediaItemAdapter) mediaPager.getAdapter()).getPlaybackControls(mediaPager.getCurrentItem());
-
-      if (previewData.getAlbumThumbnails().isEmpty() && previewData.getCaption() == null && playbackControls == null) {
-        detailsContainer.setVisibility(View.GONE);
-      } else {
-        detailsContainer.setVisibility(View.VISIBLE);
-      }
-
-      albumRail.setVisibility(previewData.getAlbumThumbnails().isEmpty() ? View.GONE : View.VISIBLE);
-      albumRailAdapter.setMedia(previewData.getAlbumThumbnails(), previewData.getActivePosition());
-      albumRail.smoothScrollToPosition(previewData.getActivePosition());
-
-      captionContainer.setVisibility(previewData.getCaption() == null ? View.GONE : View.VISIBLE);
-      caption.setText(previewData.getCaption());
-
-      if (playbackControls != null) {
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        playbackControls.setLayoutParams(params);
-
-        playbackControlsContainer.removeAllViews();
-        playbackControlsContainer.addView(playbackControls);
-      } else {
-        playbackControlsContainer.removeAllViews();
-      }
-    });
-  }
-
-  private void initializeMedia() {
-    if (!isContentTypeSupported(initialMediaType)) {
-      Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
-      Toast.makeText(getApplicationContext(), R.string.MediaPreviewActivity_unssuported_media_type, Toast.LENGTH_LONG).show();
-      finish();
-    }
-
-    Log.i(TAG, "Loading Part URI: " + initialMediaUri);
-
-    if (isMediaInDb()) {
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    } else {
-      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize, initialMediaIsVideoGif));
-
-      if (initialCaption != null) {
-        detailsContainer.setVisibility(View.VISIBLE);
-        captionContainer.setVisibility(View.VISIBLE);
-        caption.setText(initialCaption);
-      }
-    }
-  }
-
-  private int cleanupMedia() {
-    int restartItem = mediaPager.getCurrentItem();
-
-    mediaPager.removeAllViews();
-    mediaPager.setAdapter(null);
-    viewModel.setCursor(this, null, leftIsRecent);
-
-    return restartItem;
-  }
-
-  private void showOverview() {
-    startActivity(MediaOverviewActivity.forThread(this, threadId));
-  }
-
-  private void forward() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      MultiselectForwardFragmentArgs.create(
-          this,
-          threadId,
-          mediaItem.uri,
-          mediaItem.type,
-          args -> MultiselectForwardFragment.showBottomSheet(getSupportFragmentManager(), args)
-      );
-    }
-  }
-
-  private void share() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      Uri    publicUri   = PartAuthority.getAttachmentPublicUri(mediaItem.uri);
-      String mimeType    = Intent.normalizeMimeType(mediaItem.type);
-      Intent shareIntent = ShareCompat.IntentBuilder.from(this)
-                                                    .setStream(publicUri)
-                                                    .setType(mimeType)
-                                                    .createChooserIntent()
-                                                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-      try {
-        startActivity(shareIntent);
-      } catch (ActivityNotFoundException e) {
-        Log.w(TAG, "No activity existed to share the media.", e);
-        Toast.makeText(this, R.string.MediaPreviewActivity_cant_find_an_app_able_to_share_this_media, Toast.LENGTH_LONG).show();
-      }
-    }
-  }
-
-  @SuppressWarnings("CodeBlock2Expr")
-  @SuppressLint("InlinedApi")
-  private void saveToDisk() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
-        if (StorageUtil.canWriteToMediaStore()) {
-          performSavetoDisk(mediaItem);
-          return;
-        }
-
-        Permissions.with(this)
-                   .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                   .ifNecessary()
-                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
-                   .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
-                   .onAllGranted(() -> {
-                     performSavetoDisk(mediaItem);
-                   })
-                   .execute();
-      });
-    }
-  }
-
-  private void performSavetoDisk(@NonNull MediaItem mediaItem) {
-    SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
-    long               saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
-    saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void deleteMedia() {
-    MediaItem mediaItem = getCurrentMediaItem();
-    if (mediaItem == null || mediaItem.attachment == null) {
-      return;
-    }
-
-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-    builder.setIcon(R.drawable.ic_warning);
-    builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
-    builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
-    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
-      new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
-                                          mediaItem.attachment);
-          return null;
-        }
-      }.execute();
-
-      finish();
-    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    menu.clear();
-    MenuInflater inflater = this.getMenuInflater();
-    inflater.inflate(R.menu.media_preview, menu);
-
-    super.onCreateOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    if (!isMediaInDb()) {
-      menu.findItem(R.id.delete).setVisible(false);
-    }
-    super.onPrepareOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-    super.onOptionsItemSelected(item);
-
-    int itemId = item.getItemId();
-
-    if (itemId == R.id.save)                    { saveToDisk();   return true; }
-    if (itemId == R.id.delete)                  { deleteMedia();  return true; }
-    if (itemId == android.R.id.home)            { finish();       return true; }
-
-    return false;
-  }
-
-  private boolean isMediaInDb() {
-    return threadId != MediaIntentFactory.NOT_IN_A_THREAD;
-  }
-
-  private @Nullable MediaItem getCurrentMediaItem() {
-    MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-    if (adapter != null) {
-      return adapter.getMediaItemFor(mediaPager.getCurrentItem());
-    } else {
-      return null;
-    }
-  }
-
-  public static boolean isContentTypeSupported(final String contentType) {
-    return MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType);
-  }
-
-  @Override
-  public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
-    return new PagingMediaLoader(this, threadId, initialMediaUri, leftIsRecent, sorting);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
-    if (data != null) {
-      if (data.first == cursor) {
-        return;
-      }
-
-      if (cursor != null) {
-        cursor.close();
-      }
-      cursor = Objects.requireNonNull(data.first);
-
-      viewModel.setCursor(this, cursor, leftIsRecent);
-
-      int mediaPosition = Objects.requireNonNull(data.second);
-
-      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 {
-      onMediaNotAvailable();
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
-
-  }
-
-  @Override
-  public boolean singleTapOnMedia() {
-    fullscreenHelper.toggleUiVisibility();
-    return true;
-  }
-
-  @Override
-  public void onMediaNotAvailable() {
-    Toast.makeText(this, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show();
-    finish();
-  }
-
-  @Override
-  public void onMediaReady() {
-  }
-
-  @Override
-  public @NonNull VoiceNoteMediaController getVoiceNoteMediaController() {
-    return voiceNoteMediaController;
-  }
-
-  private class ViewPagerListener extends ExtendedOnPageChangedListener {
-
-    @Override
-    public void onPageSelected(int position) {
-      super.onPageSelected(position);
-
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
-        }
-
-        viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
-        initializeActionBar();
-      }
-    }
-
-
-    @Override
-    public void onPageUnselected(int position) {
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().removeObservers(MediaPreviewActivity.this);
-        }
-
-        adapter.pause(position);
-      }
-    }
-  }
-
-  private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    private final Uri     uri;
-    private final String  mediaType;
-    private final long    size;
-    private final boolean isVideoGif;
-
-    private MediaPreviewFragment mediaPreviewFragment;
-
-    SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
-                           @NonNull Uri uri,
-                           @NonNull String mediaType,
-                           long size,
-                           boolean isVideoGif)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.uri        = uri;
-      this.mediaType  = mediaType;
-      this.size       = size;
-      this.isVideoGif = isVideoGif;
-    }
-
-    @Override
-    public int getCount() {
-      return 1;
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true, isVideoGif);
-      return mediaPreviewFragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.cleanUp();
-        mediaPreviewFragment = null;
-      }
-    }
-
-    @Override
-    public @Nullable MediaItem getMediaItemFor(int position) {
-      return new MediaItem(null, null, null, uri, mediaType, -1, true);
-    }
-
-    @Override
-    public void pause(int position) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.pause();
-      }
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      if (mediaPreviewFragment != null) {
-        return mediaPreviewFragment.getBottomBarControls();
-      }
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaPreviewFragment != null;
-    }
-  }
-
-  private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
-    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
-      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-
-      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
-                              layoutParams.topMargin,
-                              insets.getSystemWindowInsetRight(),
-                              insets.getSystemWindowInsetBottom());
-
-      view.setLayoutParams(layoutParams);
-
-      return insets;
-    });
-  }
-
-  private static class CursorPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    @SuppressLint("UseSparseArrays")
-    private final Map<Integer, MediaPreviewFragment> mediaFragments = new HashMap<>();
-
-    private final Context context;
-    private final boolean leftIsRecent;
-
-    private boolean active;
-    private Cursor  cursor;
-    private int     autoPlayPosition;
-
-    CursorPagerAdapter(@NonNull FragmentManager fragmentManager,
-                       @NonNull Context context,
-                       @NonNull Cursor cursor,
-                       int autoPlayPosition,
-                       boolean leftIsRecent)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.context          = context.getApplicationContext();
-      this.cursor           = cursor;
-      this.autoPlayPosition = autoPlayPosition;
-      this.leftIsRecent     = leftIsRecent;
-    }
-
-    public void setActive(boolean active) {
-      this.active = active;
-      notifyDataSetChanged();
-    }
-
-    public void setCursor(@NonNull Cursor cursor, int autoPlayPosition) {
-      this.cursor           = cursor;
-      this.autoPlayPosition = autoPlayPosition;
-    }
-
-    @Override
-    public int getCount() {
-      if (!active) return 0;
-      else         return cursor.getCount();
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      boolean autoPlay = autoPlayPosition == position;
-      int cursorPosition = getCursorPosition(position);
-
-      autoPlayPosition = -1;
-
-      cursor.moveToPosition(cursorPosition);
-
-      MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(cursor);
-      DatabaseAttachment        attachment  = Objects.requireNonNull(mediaRecord.getAttachment());
-      MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
-
-      mediaFragments.put(position, fragment);
-
-      return fragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      MediaPreviewFragment removed = mediaFragments.remove(position);
-
-      if (removed != null) {
-        removed.cleanUp();
-      }
-
-      super.destroyItem(container, position, object);
-    }
-
-    public @Nullable MediaItem getMediaItemFor(int position) {
-      int cursorPosition = getCursorPosition(position);
-
-      if (cursor.isClosed() || cursorPosition < 0) {
-        Log.w(TAG, "Invalid cursor state! Closed: " + cursor.isClosed() + " Position: " + cursorPosition);
-        return null;
-      }
-
-      cursor.moveToPosition(cursorPosition);
-
-      MediaRecord        mediaRecord       = MediaRecord.from(cursor);
-      DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
-      RecipientId        recipientId       = mediaRecord.getRecipientId();
-      RecipientId        threadRecipientId = mediaRecord.getThreadRecipientId();
-
-      return new MediaItem(Recipient.live(recipientId).get(),
-                           Recipient.live(threadRecipientId).get(),
-                           attachment,
-                           Objects.requireNonNull(attachment.getUri()),
-                           mediaRecord.getContentType(),
-                           mediaRecord.getDate(),
-                           mediaRecord.isOutgoing());
-    }
-
-    @Override
-    public void pause(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) mediaView.pause();
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) return mediaView.getBottomBarControls();
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaFragments.containsKey(position);
-    }
-
-    private int getCursorPosition(int position) {
-      if (leftIsRecent) return position;
-      else              return cursor.getCount() - 1 - position;
-    }
-  }
-
-  private static class MediaItem {
-    private final @Nullable Recipient          recipient;
-    private final @Nullable Recipient          threadRecipient;
-    private final @Nullable DatabaseAttachment attachment;
-    private final @NonNull  Uri                uri;
-    private final @NonNull  String             type;
-    private final           long               date;
-    private final           boolean            outgoing;
-
-    private MediaItem(@Nullable Recipient recipient,
-                      @Nullable Recipient threadRecipient,
-                      @Nullable DatabaseAttachment attachment,
-                      @NonNull Uri uri,
-                      @NonNull String type,
-                      long date,
-                      boolean outgoing)
-    {
-      this.recipient       = recipient;
-      this.threadRecipient = threadRecipient;
-      this.attachment      = attachment;
-      this.uri             = uri;
-      this.type            = type;
-      this.date            = date;
-      this.outgoing        = outgoing;
-    }
-  }
-
-  interface MediaItemAdapter {
-    @Nullable MediaItem getMediaItemFor(int position);
-    void pause(int position);
-    @Nullable View getPlaybackControls(int position);
-    boolean hasFragmentFor(int position);
-  }
-}

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

@@ -342,7 +342,8 @@ public class NewConversationActivity extends ContactSelectionActivity
                                               recipient,
                                               () -> {
                                                 disposables.add(viewModel.blockContact(recipient).subscribe(() -> {
-                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_blocked, recipient.getDisplayName(this));
+                                                  contactsFragment.reset();
                                                 }));
                                               })
     );
@@ -366,7 +367,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .setPositiveButton(R.string.NewConversationActivity__remove,
                            (dialog, which) -> {
                              disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
-                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed, recipient.getDisplayName(this));
                              }));
                            }
         )
@@ -374,7 +375,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .show();
   }
 
-  private void displaySnackbar(@StringRes int message) {
-    Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show();
+  private void displaySnackbar(@StringRes int message, Object ... formatArgs) {
+    Snackbar.make(findViewById(android.R.id.content), getString(message, formatArgs), Snackbar.LENGTH_SHORT).show();
   }
 }

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

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.animation;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager2.widget.ViewPager2;
-
-/**
- * Based on https://developer.android.com/training/animation/screen-slide#depth-page
- */
-public final class DepthPageTransformer implements ViewPager.PageTransformer {
-  private static final float MIN_SCALE = 0.75f;
-
-  public void transformPage(@NonNull View view, float position) {
-    final int pageWidth = view.getWidth();
-
-    if (position < -1f) {
-      view.setAlpha(0f);
-
-    } else if (position <= 0f) {
-      view.setAlpha(1f);
-      view.setTranslationX(0f);
-      view.setScaleX(1f);
-      view.setScaleY(1f);
-
-    } else if (position <= 1f) {
-      view.setAlpha(1f - position);
-
-      view.setTranslationX(pageWidth * -position);
-
-      final float scaleFactor = MIN_SCALE + (1f - MIN_SCALE) * (1f - Math.abs(position));
-
-      view.setScaleX(scaleFactor);
-      view.setScaleY(scaleFactor);
-
-    } else {
-      view.setAlpha(0f);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer2.kt

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.animation
-
-import android.view.View
-import androidx.annotation.RequiresApi
-import androidx.viewpager2.widget.ViewPager2
-
-private const val MIN_SCALE = 0.75f
-
-/**
- * Lifted from https://developer.android.com/develop/ui/views/animations/screen-slide-2#depth-page
- */
-@RequiresApi(21)
-class DepthPageTransformer2 : ViewPager2.PageTransformer {
-
-  override fun transformPage(view: View, position: Float) {
-    view.apply {
-      val pageWidth = width
-      when {
-        position < -1 -> alpha = 0f
-        position <= 0 -> {
-          alpha = 1f
-          translationX = 0f
-          translationZ = 0f
-          scaleX = 1f
-          scaleY = 1f
-        }
-        position <= 1 -> {
-          alpha = 1 - position
-
-          translationX = pageWidth * -position
-          translationZ = -1f
-
-          val scaleFactor = (MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position)))
-          scaleX = scaleFactor
-          scaleY = scaleFactor
-        }
-        else -> alpha = 0f
-      }
-    }
-  }
-}

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

@@ -3,15 +3,14 @@ package org.thoughtcrime.securesms.animation.transitions
 import android.animation.Animator
 import android.animation.ValueAnimator
 import android.content.Context
-import android.transition.Transition
-import android.transition.TransitionValues
 import android.util.AttributeSet
 import android.view.ViewGroup
-import androidx.annotation.RequiresApi
+import androidx.core.view.ViewCompat
+import androidx.transition.Transition
+import androidx.transition.TransitionValues
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 
-@RequiresApi(21)
-class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
+class FabElevationFadeTransform(context: Context, attrs: AttributeSet) : Transition(context, attrs) {
 
   companion object {
     private const val ELEVATION = "CrossfaderTransition.ELEVATION"
@@ -19,23 +18,23 @@ class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transi
 
   override fun captureStartValues(transitionValues: TransitionValues) {
     if (transitionValues.view is FloatingActionButton) {
-      transitionValues.values[ELEVATION] = transitionValues.view.elevation
+      transitionValues.values[ELEVATION] = ViewCompat.getElevation(transitionValues.view)
     }
   }
 
   override fun captureEndValues(transitionValues: TransitionValues) {
     if (transitionValues.view is FloatingActionButton) {
-      transitionValues.values[ELEVATION] = transitionValues.view.elevation
+      transitionValues.values[ELEVATION] = ViewCompat.getElevation(transitionValues.view)
     }
   }
 
-  override fun createAnimator(sceneRoot: ViewGroup?, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
+  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
     if (startValues?.view !is FloatingActionButton || endValues?.view !is FloatingActionButton) {
       return null
     }
 
-    val startElevation = startValues.view.elevation
-    val endElevation = endValues.view.elevation
+    val startElevation = ViewCompat.getElevation(startValues.view)
+    val endElevation = ViewCompat.getElevation(endValues.view)
     if (startElevation == endElevation) {
       return null
     }
@@ -46,7 +45,7 @@ class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transi
     ).apply {
       addUpdateListener {
         val elevation = it.animatedValue as Float
-        endValues.view.elevation = elevation
+        ViewCompat.setElevation(endValues.view, elevation)
       }
     }
   }

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

@@ -119,7 +119,12 @@ public abstract class Attachment {
 
   public boolean isInProgress() {
     return transferState != AttachmentDatabase.TRANSFER_PROGRESS_DONE &&
-           transferState != AttachmentDatabase.TRANSFER_PROGRESS_FAILED;
+           transferState != AttachmentDatabase.TRANSFER_PROGRESS_FAILED &&
+           transferState != AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE;
+  }
+
+  public boolean isPermanentlyFailed() {
+    return transferState == AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE;
   }
 
   public long getSize() {

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

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.audio;
 
 import android.content.Context;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
@@ -25,13 +26,15 @@ public class AudioRecorder {
 
   private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder");
 
-  private final Context context;
+  private final Context                   context;
+  private final AudioRecorderFocusManager audioFocusManager;
 
   private Recorder recorder;
   private Uri      captureUri;
 
   public AudioRecorder(@NonNull Context context) {
     this.context = context;
+    audioFocusManager = AudioRecorderFocusManager.create(context, focusChange -> stopRecording());
   }
 
   public void startRecording() {
@@ -52,6 +55,10 @@ public class AudioRecorder {
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
 
         recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
+        int focusResult = audioFocusManager.requestAudioFocus();
+        if (focusResult != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+          Log.w(TAG, "Could not gain audio focus. Received result code " + focusResult);
+        }
         recorder.start(fds[1]);
       } catch (IOException e) {
         Log.w(TAG, e);
@@ -70,6 +77,7 @@ public class AudioRecorder {
         return;
       }
 
+      audioFocusManager.abandonAudioFocus();
       recorder.stop();
 
       try {

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.audio
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
+import android.media.AudioManager.OnAudioFocusChangeListener
+import android.os.Build
+import androidx.annotation.RequiresApi
+import org.thoughtcrime.securesms.util.ServiceUtil
+
+abstract class AudioRecorderFocusManager(val context: Context) {
+  protected val audioManager: AudioManager = ServiceUtil.getAudioManager(context)
+
+  abstract fun requestAudioFocus(): Int
+  abstract fun abandonAudioFocus(): Int
+
+  companion object {
+    @JvmStatic
+    fun create(context: Context, changeListener: OnAudioFocusChangeListener): AudioRecorderFocusManager {
+      return if (Build.VERSION.SDK_INT >= 26) {
+        AudioRecorderFocusManager26(context, changeListener)
+      } else {
+        AudioRecorderFocusManagerLegacy(context, changeListener)
+      }
+    }
+  }
+}
+
+@RequiresApi(26)
+private class AudioRecorderFocusManager26(context: Context, changeListener: OnAudioFocusChangeListener) : AudioRecorderFocusManager(context) {
+  val audioFocusRequest: AudioFocusRequest
+
+  init {
+    val audioAttributes = AudioAttributes.Builder()
+      .setUsage(AudioAttributes.USAGE_MEDIA)
+      .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+      .build()
+    audioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+      .setAudioAttributes(audioAttributes)
+      .setOnAudioFocusChangeListener(changeListener)
+      .build()
+  }
+
+  override fun requestAudioFocus(): Int {
+    return audioManager.requestAudioFocus(audioFocusRequest)
+  }
+
+  override fun abandonAudioFocus(): Int {
+    return audioManager.abandonAudioFocusRequest(audioFocusRequest)
+  }
+}
+
+private class AudioRecorderFocusManagerLegacy(context: Context, val changeListener: OnAudioFocusChangeListener) : AudioRecorderFocusManager(context) {
+  override fun requestAudioFocus(): Int {
+    return audioManager.requestAudioFocus(changeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+  }
+
+  override fun abandonAudioFocus(): Int {
+    return audioManager.abandonAudioFocus(changeListener)
+  }
+}

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

@@ -123,7 +123,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
         }
       )
     }
-    clearButton.setOnClickListener { viewModel.clear() }
+    clearButton.setOnClickListener { viewModel.clearAvatar() }
 
     setFragmentResultListener(TextAvatarCreationFragment.REQUEST_KEY_TEXT) { _, bundle ->
       val text = AvatarBundler.extractText(bundle)

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

@@ -32,7 +32,7 @@ sealed class AvatarPickerViewModel(private val repository: AvatarPickerRepositor
     }
   }
 
-  fun clear() {
+  fun clearAvatar() {
     store.update {
       val avatar = getDefaultAvatarFromRepository()
       it.copy(currentAvatar = avatar, canSave = true, canClear = false, isCleared = true)

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

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import androidx.documentfile.provider.DocumentFile;
 
 import com.annimon.stream.function.Predicate;
@@ -19,6 +20,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.Conversions;
 import org.signal.core.util.CursorUtil;
 import org.signal.core.util.SetUtil;
+import org.signal.core.util.SqlUtil;
 import org.signal.core.util.Stopwatch;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.kdf.HKDF;
@@ -62,10 +64,15 @@ import java.io.OutputStream;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -84,7 +91,11 @@ public class FullBackupExporter extends FullBackupBase {
   private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
   private static final long FINAL_MESSAGE_COUNT              = 1L;
 
-  private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
+  /**
+   * Tables in list will still have their *schema* exported (so the tables will be created),
+   * but we will not export the actual contents.
+   */
+  private static final Set<String> TABLE_CONTENT_BLOCKLIST = SetUtil.newHashSet(
       SignedPreKeyDatabase.TABLE_NAME,
       OneTimePreKeyDatabase.TABLE_NAME,
       SessionDatabase.TABLE_NAME,
@@ -175,7 +186,7 @@ public class FullBackupExporter extends FullBackupBase {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (table.equals(StickerDatabase.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
-        } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
+        } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
           count = exportTable(table, input, outputStream, null, null, count, estimatedCount, cancellationSignal);
         }
         stopwatch.split("table::" + table);
@@ -229,7 +240,7 @@ public class FullBackupExporter extends FullBackupBase {
         count += getCount(input, BackupCountQueries.getAttachmentCount());
       } else if (table.equals(StickerDatabase.TABLE_NAME)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
-      } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
+      } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
       }
     }
@@ -266,31 +277,112 @@ public class FullBackupExporter extends FullBackupBase {
   private static List<String> exportSchema(@NonNull SQLiteDatabase input, @NonNull BackupFrameOutputStream outputStream)
       throws IOException
   {
-    List<String> tables = new LinkedList<>();
+    List<String> tablesInOrder = getTablesToExportInOrder(input);
 
-    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master", null)) {
+    Map<String, String> createStatementsByTable = new HashMap<>();
+
+    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master WHERE type = 'table' AND sql NOT NULL", null)) {
       while (cursor != null && cursor.moveToNext()) {
         String sql  = cursor.getString(0);
         String name = cursor.getString(1);
-        String type = cursor.getString(2);
 
-        if (sql != null) {
-          boolean isSmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
-          boolean isMmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
-          boolean isEmojiFtsSecretTable = name != null && !name.equals(EmojiSearchDatabase.TABLE_NAME) && name.startsWith(EmojiSearchDatabase.TABLE_NAME);
+        createStatementsByTable.put(name, sql);
+      }
+    }
 
-          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable && !isEmojiFtsSecretTable) {
-            if ("table".equals(type)) {
-              tables.add(name);
-            }
+    for (String table :  tablesInOrder) {
+      String statement = createStatementsByTable.get(table);
 
-            outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(cursor.getString(0)).build());
-          }
+      if (statement != null) {
+        outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(statement).build());
+      } else {
+        throw new IOException("Failed to find a create statement for table: " + table);
+      }
+    }
+
+    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master where type != 'table' AND sql NOT NULL", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String sql  = cursor.getString(0);
+        String name = cursor.getString(1);
+
+        if (isTableAllowed(name)) {
+          outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(sql).build());
         }
       }
     }
 
-    return tables;
+    return tablesInOrder;
+  }
+
+  /**
+   * Returns the list of tables we should export, in the order they should be exported in.
+   * The order is chosen to ensure we won't violate any foreign key constraints when we import them.
+   */
+  private static List<String> getTablesToExportInOrder(@NonNull SQLiteDatabase input) {
+    List<String> tables = SqlUtil.getAllTables(input)
+                                 .stream()
+                                 .filter(FullBackupExporter::isTableAllowed)
+                                 .sorted()
+                                 .collect(Collectors.toList());
+
+    
+    Map<String, Set<String>> dependsOn = new LinkedHashMap<>();
+    for (String table : tables) {
+      dependsOn.put(table, SqlUtil.getForeignKeyDependencies(input, table));
+    }
+    
+    return computeTableOrder(dependsOn);
+  }
+
+  @VisibleForTesting
+  static List<String> computeTableOrder(@NonNull Map<String, Set<String>> dependsOn) {
+    List<String> rootNodes = dependsOn.keySet()
+                                      .stream()
+                                      .filter(table -> {
+                                        boolean nothingDependsOnIt = dependsOn.values().stream().noneMatch(it -> it.contains(table));
+                                        return nothingDependsOnIt;
+                                      })
+                                      .sorted()
+                                      .collect(Collectors.toList());
+
+    LinkedHashSet<String> outputOrder = new LinkedHashSet<>();
+
+    for (String root : rootNodes) {
+      postOrderTraversal(root, dependsOn, outputOrder);
+    }
+
+    return new ArrayList<>(outputOrder);
+  }
+
+  private static void postOrderTraversal(String current, Map<String, Set<String>> dependsOn, LinkedHashSet<String> outputOrder) {
+    Set<String> dependencies = dependsOn.get(current);
+
+    if (dependencies == null || dependencies.isEmpty()) {
+      outputOrder.add(current);
+      return;
+    }
+
+    for (String dependency : dependencies) {
+      postOrderTraversal(dependency, dependsOn, outputOrder);
+    }
+
+    outputOrder.add(current);
+  }
+
+  private static boolean isTableAllowed(@Nullable String table) {
+    if (table == null) {
+      return true;
+    }
+
+    boolean isReservedTable       = table.startsWith("sqlite_");
+    boolean isSmsFtsSecretTable   = !table.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && table.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
+    boolean isMmsFtsSecretTable   = !table.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && table.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
+    boolean isEmojiFtsSecretTable = !table.equals(EmojiSearchDatabase.TABLE_NAME) && table.startsWith(EmojiSearchDatabase.TABLE_NAME);
+
+    return !isReservedTable &&
+           !isSmsFtsSecretTable &&
+           !isMmsFtsSecretTable &&
+           !isEmojiFtsSecretTable;
   }
 
   private static int exportTable(@NonNull String table,

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt

@@ -11,14 +11,14 @@ import io.reactivex.rxjava3.subjects.Subject
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.FragmentWrapperActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
 
 /**
  * Activity which houses the gift flow.
  */
 class GiftFlowActivity : FragmentWrapperActivity(), DonationPaymentComponent {
 
-  override val donationPaymentRepository: DonationPaymentRepository by lazy { DonationPaymentRepository(this) }
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
 
   override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create()
 

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt

@@ -4,10 +4,12 @@ import android.content.DialogInterface
 import android.view.KeyEvent
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -20,8 +22,10 @@ import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
 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
@@ -33,10 +37,11 @@ import org.thoughtcrime.securesms.keyboard.KeyboardPage
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.Debouncer
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
  * Allows the user to confirm details about a gift, add a message, and finally make a payment.
@@ -48,7 +53,8 @@ class GiftFlowConfirmationFragment :
   ),
   EmojiKeyboardPageFragment.Callback,
   EmojiEventListener,
-  EmojiSearchFragment.Callback {
+  EmojiSearchFragment.Callback,
+  DonationCheckoutDelegate.Callback {
 
   companion object {
     private val TAG = Log.tag(GiftFlowConfirmationFragment::class.java)
@@ -67,9 +73,9 @@ class GiftFlowConfirmationFragment :
 
   private val lifecycleDisposable = LifecycleDisposable()
   private var errorDialog: DialogInterface? = null
+  private var donationCheckoutDelegate: DonationCheckoutDelegate? = null
   private lateinit var processingDonationPaymentDialog: AlertDialog
   private lateinit var verifyingRecipientDonationPaymentDialog: AlertDialog
-  private lateinit var donationPaymentComponent: DonationPaymentComponent
   private lateinit var textInputViewHolder: TextInput.MultilineViewHolder
 
   private val eventPublisher = PublishSubject.create<TextInput.TextInputEvent>()
@@ -81,7 +87,7 @@ class GiftFlowConfirmationFragment :
 
     keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
 
-    donationPaymentComponent = requireListener()
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this)
 
     processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
       .setView(R.layout.processing_payment_dialog)
@@ -98,13 +104,29 @@ class GiftFlowConfirmationFragment :
 
     emojiKeyboard.setFragmentManager(childFragmentManager)
 
-    val googlePayButton = requireView().findViewById<GooglePayButton>(R.id.google_pay_button)
-    googlePayButton.setOnGooglePayClickListener {
-      viewModel.requestTokenFromGooglePay(getString(R.string.preferences__one_time))
+    val continueButton = requireView().findViewById<MaterialButton>(R.id.continue_button)
+    continueButton.setOnClickListener {
+      findNavController().safeNavigate(
+        GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToGatewaySelectorBottomSheet(
+          with(viewModel.snapshot) {
+            GatewayRequest(
+              donateToSignalType = DonateToSignalType.GIFT,
+              badge = giftBadge!!,
+              label = getString(R.string.preferences__one_time),
+              price = giftPrices[currency]!!.amount,
+              currencyCode = currency.currencyCode,
+              level = giftLevel!!,
+              recipientId = recipient!!.id,
+              additionalMessage = additionalMessage?.toString()
+            )
+          }
+        )
+      )
     }
 
     val textInput = requireView().findViewById<FrameLayout>(R.id.text_input)
     val emojiToggle = textInput.findViewById<ImageView>(R.id.emoji_toggle)
+    val amountView = requireView().findViewById<TextView>(R.id.amount)
     textInputViewHolder = TextInput.MultilineViewHolder(textInput, eventPublisher)
     textInputViewHolder.onAttachedToWindow()
 
@@ -165,29 +187,17 @@ class GiftFlowConfirmationFragment :
       } else {
         processingDonationPaymentDialog.dismiss()
       }
+
+      amountView.text = FiatMoneyUtil.format(resources, state.giftPrices[state.currency]!!, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
     }
 
     lifecycleDisposable.bindTo(viewLifecycleOwner)
-
     lifecycleDisposable += DonationError
       .getErrorsForSource(DonationErrorSource.GIFT)
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { donationError ->
         onPaymentError(donationError)
       }
-
-    lifecycleDisposable += viewModel.events.observeOn(AndroidSchedulers.mainThread()).subscribe { donationEvent ->
-      when (donationEvent) {
-        is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed()
-        DonationEvent.RequestTokenSuccess -> Log.i(TAG, "Successfully got request token from Google Pay")
-        DonationEvent.SubscriptionCancelled -> Unit
-        is DonationEvent.SubscriptionCancellationFailed -> Unit
-      }
-    }
-
-    lifecycleDisposable += donationPaymentComponent.googlePayResultPublisher.subscribe {
-      viewModel.onActivityResult(it.requestCode, it.resultCode, it.data)
-    }
   }
 
   override fun onDestroyView() {
@@ -196,6 +206,7 @@ class GiftFlowConfirmationFragment :
     processingDonationPaymentDialog.dismiss()
     debouncer.clear()
     verifyingRecipientDonationPaymentDialog.dismiss()
+    donationCheckoutDelegate = null
   }
 
   private fun getConfiguration(giftFlowState: GiftFlowState): DSLConfiguration {
@@ -225,16 +236,6 @@ class GiftFlowConfirmationFragment :
     }
   }
 
-  private fun onPaymentConfirmed() {
-    val mainActivityIntent = MainActivity.clearTop(requireContext())
-    val conversationIntent = ConversationIntents
-      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
-      .withGiftBadge(viewModel.snapshot.giftBadge!!)
-      .build()
-
-    requireActivity().startActivities(arrayOf(mainActivityIntent, conversationIntent))
-  }
-
   private fun onPaymentError(throwable: Throwable?) {
     Log.w(TAG, "onPaymentError", throwable, true)
 
@@ -276,4 +277,24 @@ class GiftFlowConfirmationFragment :
       eventPublisher.onNext(TextInput.TextInputEvent.OnKeyEvent(keyEvent))
     }
   }
+
+  override fun navigateToStripePaymentInProgress(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToStripePaymentInProgressFragment(DonationProcessorAction.PROCESS_NEW_DONATION, gatewayRequest))
+  }
+
+  override fun navigateToCreditCardForm(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToCreditCardFragment(gatewayRequest))
+  }
+
+  override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
+    val mainActivityIntent = MainActivity.clearTop(requireContext())
+    val conversationIntent = ConversationIntents
+      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
+      .withGiftBadge(viewModel.snapshot.giftBadge!!)
+      .build()
+
+    requireActivity().startActivities(arrayOf(mainActivityIntent, conversationIntent))
+  }
+
+  override fun onProcessorActionProcessed() = Unit
 }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowRepository.kt

@@ -1,14 +1,22 @@
 package org.thoughtcrime.securesms.badges.gifts.flow
 
+import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.database.RecipientDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
+import org.thoughtcrime.securesms.util.ProfileUtil
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
 import org.whispersystems.signalservice.internal.ServiceResponse
+import java.io.IOException
 import java.util.Currency
 import java.util.Locale
 
@@ -17,6 +25,10 @@ import java.util.Locale
  */
 class GiftFlowRepository {
 
+  companion object {
+    private val TAG = Log.tag(GiftFlowRepository::class.java)
+  }
+
   fun getGiftBadge(): Single<Pair<Long, Badge>> {
     return Single
       .fromCallable {
@@ -44,4 +56,37 @@ class GiftFlowRepository {
           .mapValues { (currency, price) -> FiatMoney(price, currency) }
       }
   }
+
+  /**
+   * Verifies that the given recipient is a supported target for a gift.
+   */
+  fun verifyRecipientIsAllowedToReceiveAGift(badgeRecipient: RecipientId): Completable {
+    return Completable.fromAction {
+      Log.d(TAG, "Verifying badge recipient $badgeRecipient", true)
+      val recipient = Recipient.resolved(badgeRecipient)
+
+      if (recipient.isSelf) {
+        Log.d(TAG, "Cannot send a gift to self.", true)
+        throw DonationError.GiftRecipientVerificationError.SelectedRecipientDoesNotSupportGifts
+      }
+
+      if (recipient.isGroup || recipient.isDistributionList || recipient.registered != RecipientDatabase.RegisteredState.REGISTERED) {
+        Log.w(TAG, "Invalid badge recipient $badgeRecipient. Verification failed.", true)
+        throw DonationError.GiftRecipientVerificationError.SelectedRecipientIsInvalid
+      }
+
+      try {
+        val profile = ProfileUtil.retrieveProfileSync(ApplicationDependencies.getApplication(), recipient, SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL)
+        if (!profile.profile.capabilities.isGiftBadges) {
+          Log.w(TAG, "Badge recipient does not support gifting. Verification failed.", true)
+          throw DonationError.GiftRecipientVerificationError.SelectedRecipientDoesNotSupportGifts
+        } else {
+          Log.d(TAG, "Badge recipient supports gifting. Verification successful.", true)
+        }
+      } catch (e: IOException) {
+        Log.w(TAG, "Failed to retrieve profile for recipient.", e, true)
+        throw DonationError.GiftRecipientVerificationError.FailedToFetchProfile(e)
+      }
+    }.subscribeOn(Schedulers.io())
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt

@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
@@ -18,7 +17,6 @@ import org.thoughtcrime.securesms.components.settings.models.SplashImage
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
@@ -30,7 +28,9 @@ class GiftFlowStartFragment : DSLSettingsFragment(
 
   private val viewModel: GiftFlowViewModel by viewModels(
     ownerProducer = { requireActivity() },
-    factoryProducer = { GiftFlowViewModel.Factory(GiftFlowRepository(), requireListener<DonationPaymentComponent>().donationPaymentRepository) }
+    factoryProducer = {
+      GiftFlowViewModel.Factory(GiftFlowRepository())
+    }
   )
 
   private val lifecycleDisposable = LifecycleDisposable()

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt

@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.badges.gifts.flow
 
-import android.content.Intent
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.google.android.gms.wallet.PaymentData
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -14,16 +11,9 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
-import org.signal.donations.GooglePayApi
-import org.signal.donations.GooglePayPaymentSource
-import org.thoughtcrime.securesms.badges.gifts.Gifts
 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.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
@@ -34,12 +24,9 @@ import java.util.Currency
  * Maintains state as a user works their way through the gift flow.
  */
 class GiftFlowViewModel(
-  val repository: GiftFlowRepository,
-  val donationPaymentRepository: DonationPaymentRepository
+  private val giftFlowRepository: GiftFlowRepository
 ) : ViewModel() {
 
-  private var giftToPurchase: Gift? = null
-
   private val store = RxStore(
     GiftFlowState(
       currency = SignalStore.donationsValues().getOneTimeCurrency()
@@ -83,7 +70,7 @@ class GiftFlowViewModel(
       }
     }
 
-    disposables += repository.getGiftPricing().subscribe { giftPrices ->
+    disposables += giftFlowRepository.getGiftPricing().subscribe { giftPrices ->
       store.update {
         it.copy(
           giftPrices = giftPrices,
@@ -92,7 +79,7 @@ class GiftFlowViewModel(
       }
     }
 
-    disposables += repository.getGiftBadge().subscribeBy(
+    disposables += giftFlowRepository.getGiftBadge().subscribeBy(
       onSuccess = { (giftLevel, giftBadge) ->
         store.update {
           it.copy(
@@ -127,79 +114,6 @@ class GiftFlowViewModel(
     return store.state.giftPrices.keys.map { it.currencyCode }
   }
 
-  fun requestTokenFromGooglePay(label: String) {
-    val giftLevel = store.state.giftLevel ?: return
-    val giftPrice = store.state.giftPrices[store.state.currency] ?: return
-    val giftRecipient = store.state.recipient?.id ?: return
-
-    this.giftToPurchase = Gift(giftLevel, giftPrice)
-
-    store.update { it.copy(stage = GiftFlowState.Stage.RECIPIENT_VERIFICATION) }
-    disposables += donationPaymentRepository.verifyRecipientIsAllowedToReceiveAGift(giftRecipient)
-      .observeOn(AndroidSchedulers.mainThread())
-      .subscribeBy(
-        onComplete = {
-          store.update { it.copy(stage = GiftFlowState.Stage.TOKEN_REQUEST) }
-          donationPaymentRepository.requestTokenFromGooglePay(giftToPurchase!!.price, label, Gifts.GOOGLE_PAY_REQUEST_CODE)
-        },
-        onError = this::onPaymentFlowError
-      )
-  }
-
-  fun onActivityResult(
-    requestCode: Int,
-    resultCode: Int,
-    data: Intent?
-  ) {
-    val gift = giftToPurchase
-    giftToPurchase = null
-
-    val recipient = store.state.recipient?.id
-
-    donationPaymentRepository.onActivityResult(
-      requestCode, resultCode, data, Gifts.GOOGLE_PAY_REQUEST_CODE,
-      object : GooglePayApi.PaymentRequestCallback {
-        override fun onSuccess(paymentData: PaymentData) {
-          if (gift != null && recipient != null) {
-            eventPublisher.onNext(DonationEvent.RequestTokenSuccess)
-
-            store.update { it.copy(stage = GiftFlowState.Stage.PAYMENT_PIPELINE) }
-
-            donationPaymentRepository.continuePayment(gift.price, GooglePayPaymentSource(paymentData), recipient, store.state.additionalMessage?.toString(), gift.level).subscribeBy(
-              onError = this@GiftFlowViewModel::onPaymentFlowError,
-              onComplete = {
-                store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-                eventPublisher.onNext(DonationEvent.PaymentConfirmationSuccess(store.state.giftBadge!!))
-              }
-            )
-          } else {
-            store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-          }
-        }
-
-        override fun onError(googlePayException: GooglePayApi.GooglePayException) {
-          store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-          DonationError.routeDonationError(ApplicationDependencies.getApplication(), DonationError.getGooglePayRequestTokenError(DonationErrorSource.GIFT, googlePayException))
-        }
-
-        override fun onCancelled() {
-          store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-        }
-      }
-    )
-  }
-
-  private fun onPaymentFlowError(throwable: Throwable) {
-    store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-    val donationError: DonationError = if (throwable is DonationError) {
-      throwable
-    } else {
-      Log.w(TAG, "Failed to complete payment or redemption", throwable, true)
-      DonationError.genericBadgeRedemptionFailure(DonationErrorSource.GIFT)
-    }
-    DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError)
-  }
-
   private fun getLoadState(
     oldState: GiftFlowState,
     giftPrices: Map<Currency, FiatMoney>? = null,
@@ -237,14 +151,12 @@ class GiftFlowViewModel(
   }
 
   class Factory(
-    private val repository: GiftFlowRepository,
-    private val donationPaymentRepository: DonationPaymentRepository
+    private val repository: GiftFlowRepository
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(
         GiftFlowViewModel(
-          repository,
-          donationPaymentRepository
+          repository
         )
       ) as T
     }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt

@@ -62,7 +62,10 @@ class GiftThanksSheet : DSLSettingsBottomSheetFragment() {
       )
 
       noPadTextPref(
-        title = DSLSettingsText.from(getString(R.string.GiftThanksSheet__youve_gifted_a_badge_to_s, recipient.getDisplayName(requireContext())))
+        title = DSLSettingsText.from(
+          getString(R.string.GiftThanksSheet__youve_gifted_a_badge_to_s, recipient.getDisplayName(requireContext())),
+          DSLSettingsText.CenterModifier
+        )
       )
 
       space(DimensionUnit.DP.toPixels(37f).toInt())

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

@@ -42,8 +42,13 @@ data class LargeBadge(
     override fun bind(model: Model) {
       badge.setBadge(model.largeBadge.badge)
 
-      name.text = model.largeBadge.badge.name
-      description.text = model.largeBadge.badge.resolveDescription(model.shortName)
+      name.text = context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal, model.shortName)
+      description.text = if (model.largeBadge.badge.isSubscription()) {
+        context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly, model.shortName)
+      } else {
+        context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation, model.shortName)
+      }
+
       description.setLines(model.maxLines)
       description.maxLines = model.maxLines
       description.minLines = model.maxLines

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

@@ -12,7 +12,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.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -21,7 +21,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
 
   private val viewModel: BecomeASustainerViewModel by viewModels(
     factoryProducer = {
-      BecomeASustainerViewModel.Factory(SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
+      BecomeASustainerViewModel.Factory(MonthlyDonationRepository(ApplicationDependencies.getDonationsService()))
     }
   )
 

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

@@ -7,10 +7,10 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.util.livedata.Store
 
-class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository) : ViewModel() {
+class BecomeASustainerViewModel(subscriptionsRepository: MonthlyDonationRepository) : ViewModel() {
 
   private val store = Store(BecomeASustainerState())
 
@@ -37,7 +37,7 @@ class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository
     private val TAG = Log.tag(BecomeASustainerViewModel::class.java)
   }
 
-  class Factory(private val subscriptionsRepository: SubscriptionsRepository) : ViewModelProvider.Factory {
+  class Factory(private val subscriptionsRepository: MonthlyDonationRepository) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(BecomeASustainerViewModel(subscriptionsRepository))!!
     }

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

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -31,7 +31,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   private val lifecycleDisposable = LifecycleDisposable()
   private val viewModel: BadgesOverviewViewModel by viewModels(
     factoryProducer = {
-      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
+      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), MonthlyDonationRepository(ApplicationDependencies.getDonationsService()))
     }
   )
 

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

@@ -12,7 +12,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
@@ -23,7 +23,7 @@ private val TAG = Log.tag(BadgesOverviewViewModel::class.java)
 
 class BadgesOverviewViewModel(
   private val badgeRepository: BadgeRepository,
-  private val subscriptionsRepository: SubscriptionsRepository
+  private val subscriptionsRepository: MonthlyDonationRepository
 ) : ViewModel() {
   private val store = Store(BadgesOverviewState())
   private val eventSubject = PublishSubject.create<BadgesOverviewEvent>()
@@ -89,7 +89,7 @@ class BadgesOverviewViewModel(
 
   class Factory(
     private val badgeRepository: BadgeRepository,
-    private val subscriptionsRepository: SubscriptionsRepository
+    private val subscriptionsRepository: MonthlyDonationRepository
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(BadgesOverviewViewModel(badgeRepository, subscriptionsRepository)))

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

@@ -18,12 +18,12 @@ import org.thoughtcrime.securesms.badges.models.LargeBadge
 import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
 import org.thoughtcrime.securesms.databinding.ViewBadgeBottomSheetDialogFragmentBinding
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.visible
@@ -57,7 +57,7 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
     }
 
     @Suppress("CascadeIf")
-    if (PlayServicesUtil.getPlayServicesStatus(requireContext()) != PlayServicesUtil.PlayServicesStatus.SUCCESS) {
+    if (!InAppDonations.hasAtLeastOnePaymentMethodAvailable()) {
       binding.noSupport.visible = true
       binding.action.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_open_20)
       binding.action.setText(R.string.preferences__donate_to_signal)

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

@@ -20,7 +20,9 @@ import androidx.annotation.StringRes;
 import androidx.core.widget.TextViewCompat;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
 import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public final class ContactFilterView extends FrameLayout {
@@ -52,6 +54,8 @@ public final class ContactFilterView extends FrameLayout {
     this.clearToggle     = findViewById(R.id.search_clear);
     this.toggleContainer = findViewById(R.id.toggle_container);
 
+    EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(context));
+
     this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {

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

@@ -475,7 +475,9 @@ public class InputPanel extends LinearLayout
     future.addListener(new AssertedSuccessListener<Void>() {
       @Override
       public void onSuccess(Void result) {
-        fadeInNormalComposeViews();
+        if (voiceNoteDraftView.getDraft() == null) {
+          fadeInNormalComposeViews();
+        }
       }
     });
 

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

@@ -11,7 +11,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.animation.addListener
 import androidx.core.widget.addTextChangedListener
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.setIncognitoKeyboardEnabled
 import org.thoughtcrime.securesms.util.visible
 
 /**
@@ -39,6 +41,8 @@ class Material3SearchToolbar @JvmOverloads constructor(
     close.setOnClickListener { collapse() }
     clear.setOnClickListener { input.setText("") }
 
+    input.setIncognitoKeyboardEnabled(TextSecurePreferences.isIncognitoKeyboardEnabled(context))
+
     input.addTextChangedListener(afterTextChanged = {
       clear.visible = !it.isNullOrBlank()
       listener?.onSearchTextChange(it?.toString() ?: "")

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

@@ -20,6 +20,8 @@ import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
+import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class SearchToolbar extends LinearLayout {
 
@@ -57,6 +59,8 @@ public class SearchToolbar extends LinearLayout {
     SearchView searchView = (SearchView) searchItem.getActionView();
     EditText   searchText = searchView.findViewById(R.id.search_src_text);
 
+    EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(getContext()));
+
     searchView.setSubmitButtonEnabled(false);
     searchView.setMaxWidth(Integer.MAX_VALUE);
 

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

@@ -18,13 +18,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Px;
 import androidx.annotation.UiThread;
+import androidx.appcompat.widget.AppCompatImageView;
 
 import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.TransitionOptions;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 
 import org.signal.core.util.logging.Log;
@@ -34,9 +38,11 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
+import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -62,10 +68,12 @@ public class ThumbnailView extends FrameLayout {
   private static final int    MIN_HEIGHT = 2;
   private static final int    MAX_HEIGHT = 3;
 
-  private ImageView         image;
-  private ImageView         blurhash;
-  private View              playOverlay;
-  private View              captionIcon;
+  private final ImageView          image;
+  private final ImageView          blurhash;
+  private final View               playOverlay;
+  private final View               captionIcon;
+  private final AppCompatImageView errorImage;
+
   private OnClickListener   parentClickListener;
 
   private final int[] dimens        = new int[2];
@@ -97,6 +105,7 @@ public class ThumbnailView extends FrameLayout {
     this.blurhash    = findViewById(R.id.thumbnail_blurhash);
     this.playOverlay = findViewById(R.id.play_overlay);
     this.captionIcon = findViewById(R.id.thumbnail_caption_icon);
+    this.errorImage  = findViewById(R.id.thumbnail_error);
 
     super.setOnClickListener(new ThumbnailClickDispatcher());
 
@@ -302,6 +311,34 @@ public class ThumbnailView extends FrameLayout {
                                                     boolean showControls, boolean isPreview,
                                                     int naturalWidth, int naturalHeight)
   {
+    if (slide.asAttachment().isPermanentlyFailed()) {
+      this.slide = slide;
+
+      transferControls.ifPresent(c -> c.setVisibility(View.GONE));
+      playOverlay.setVisibility(View.GONE);
+
+      glideRequests.clear(blurhash);
+      blurhash.setImageDrawable(null);
+
+      glideRequests.clear(image);
+      image.setImageDrawable(null);
+
+      int errorImageResource;
+      if (slide instanceof ImageSlide) {
+        errorImageResource = R.drawable.ic_photo_slash_outline_24;
+      } else if (slide instanceof VideoSlide) {
+        errorImageResource = R.drawable.ic_video_slash_outline_24;
+      } else {
+        errorImageResource = R.drawable.ic_error_outline_24;
+      }
+      errorImage.setImageResource(errorImageResource);
+      errorImage.setVisibility(View.VISIBLE);
+
+      return new SettableFuture<>(true);
+    } else {
+      errorImage.setVisibility(View.GONE);
+    }
+
     if (showControls) {
       getTransferControls().setSlide(slide);
       getTransferControls().setDownloadClickListener(new DownloadClickDispatcher());
@@ -384,13 +421,21 @@ public class ThumbnailView extends FrameLayout {
   }
 
   public ListenableFuture<Boolean> setImageResource(@NonNull GlideRequests glideRequests, @NonNull Uri uri, int width, int height) {
+    return setImageResource(glideRequests, uri, width, height, true, null);
+  }
+
+  public ListenableFuture<Boolean> setImageResource(@NonNull GlideRequests glideRequests, @NonNull Uri uri, int width, int height, boolean animate, @Nullable RequestListener<Drawable> listener) {
     SettableFuture<Boolean> future = new SettableFuture<>();
 
     if (transferControls.isPresent()) getTransferControls().setVisibility(View.GONE);
 
-    GlideRequest request = glideRequests.load(new DecryptableUri(uri))
-                                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                                        .transition(withCrossFade());
+    GlideRequest<Drawable> request = glideRequests.load(new DecryptableUri(uri))
+                                                  .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                                  .listener(listener);
+
+    if (animate) {
+      request = request.transition(withCrossFade());
+    }
 
     if (width > 0 && height > 0) {
       request = request.override(width, height);
@@ -532,11 +577,13 @@ public class ThumbnailView extends FrameLayout {
   private class ThumbnailClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      if (thumbnailClickListener        != null &&
-          slide                         != null &&
-          slide.asAttachment().getUri() != null &&
-          slide.getTransferState()      == AttachmentDatabase.TRANSFER_PROGRESS_DONE)
-      {
+      boolean validThumbnail = slide != null &&
+                               slide.asAttachment().getUri() != null &&
+                               slide.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_DONE;
+
+      boolean permanentFailure = slide != null && slide.asAttachment().isPermanentlyFailed();
+
+      if (thumbnailClickListener != null && (validThumbnail || permanentFailure)) {
         thumbnailClickListener.onClick(view, slide);
       } else if (parentClickListener != null) {
         parentClickListener.onClick(view);

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

@@ -18,6 +18,7 @@ import androidx.annotation.Px;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
 
+import org.signal.core.util.DimensionUnit;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -58,7 +59,7 @@ public class TooltipPopup extends PopupWindow {
           ViewGroup.LayoutParams.WRAP_CONTENT,
           ViewGroup.LayoutParams.WRAP_CONTENT);
 
-    this.anchor          = anchor;
+    this.anchor      = anchor;
     this.position    = getRtlPosition(anchor.getContext(), rawPosition);
     this.startMargin = startMargin;
 
@@ -83,10 +84,10 @@ public class TooltipPopup extends PopupWindow {
 
     if (backgroundTint == 0) {
       bubble.getBackground().setColorFilter(ContextCompat.getColor(anchor.getContext(), R.color.tooltip_default_color), PorterDuff.Mode.MULTIPLY);
-      arrow.setColorFilter(ContextCompat.getColor(anchor.getContext(), R.color.tooltip_default_color), PorterDuff.Mode.MULTIPLY);
+      arrow.setColorFilter(ContextCompat.getColor(anchor.getContext(), R.color.tooltip_default_color), PorterDuff.Mode.SRC_IN);
     } else {
       bubble.getBackground().setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY);
-      arrow.setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY);
+      arrow.setColorFilter(backgroundTint, PorterDuff.Mode.SRC_IN);
     }
 
     if (iconGlideModel != null) {
@@ -148,8 +149,10 @@ public class TooltipPopup extends PopupWindow {
     switch (position) {
       case POSITION_ABOVE:
         xoffset += startMargin;
+        xoffset -= DimensionUnit.DP.toPixels(20);
       case POSITION_BELOW:
         xoffset += startMargin;
+        xoffset -= DimensionUnit.DP.toPixels(20);
         break;
       case POSITION_LEFT:
         xoffset += startMargin;

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

@@ -183,15 +183,20 @@ public final class TransferControlView extends FrameLayout {
   }
 
   private int getTransferState(@NonNull List<Slide> slides) {
-    int transferState = AttachmentDatabase.TRANSFER_PROGRESS_DONE;
+    int     transferState = AttachmentDatabase.TRANSFER_PROGRESS_DONE;
+    boolean allFailed     = true;
+
     for (Slide slide : slides) {
-      if (slide.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_PENDING && transferState == AttachmentDatabase.TRANSFER_PROGRESS_DONE) {
-        transferState = slide.getTransferState();
-      } else {
-        transferState = Math.max(transferState, slide.getTransferState());
+      if (slide.getTransferState() != AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE) {
+        allFailed = false;
+        if (slide.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_PENDING && transferState == AttachmentDatabase.TRANSFER_PROGRESS_DONE) {
+          transferState = slide.getTransferState();
+        } else {
+          transferState = Math.max(transferState, slide.getTransferState());
+        }
       }
     }
-    return transferState;
+    return allFailed ? AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE : transferState;
   }
 
   private String getDownloadText(@NonNull List<Slide> slides) {

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

@@ -13,6 +13,8 @@ import androidx.appcompat.widget.AppCompatEditText;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -48,6 +50,10 @@ public class EmojiEditText extends AppCompatEditText {
         listener.onFocusChange(v, hasFocus);
       }
     });
+
+    if (!isInEditMode()) {
+      EditTextExtensionsKt.setIncognitoKeyboardEnabled(this, TextSecurePreferences.isIncognitoKeyboardEnabled(context));
+    }
   }
 
   public void insertEmoji(String emoji) {

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

@@ -9,4 +9,5 @@ public final class EmojiStrings {
   public static final String FILE               = "\uD83D\uDCCE";
   public static final String STICKER            = "\u2B50";
   public static final String GIFT               = "\uD83C\uDF81";
+  public static final String CARD               = "\uD83D\uDCB3";
 }

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

@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.components.reminder
+
+import android.content.Context
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Reminder shown when CDS is in a permanent error state, preventing us from doing a sync.
+ */
+class CdsPermanentErrorReminder(context: Context) : Reminder(null, context.getString(R.string.reminder_cds_permanent_error_body)) {
+
+  init {
+    addAction(
+      Action(
+        context.getString(R.string.reminder_cds_permanent_error_learn_more),
+        R.id.reminder_action_cds_permanent_error_learn_more
+      )
+    )
+  }
+
+  override fun isDismissable(): Boolean {
+    return false
+  }
+
+  override fun getImportance(): Importance {
+    return Importance.ERROR
+  }
+
+  companion object {
+    /**
+     * Even if we're not truly "permanently blocked", if the time until we're unblocked is long enough, we'd rather show the permanent error message than
+     * telling the user to wait for 3 months or something.
+     */
+    val PERMANENT_TIME_CUTOFF = 30.days.inWholeMilliseconds
+
+    @JvmStatic
+    fun isEligible(): Boolean {
+      val timeUntilUnblock = SignalStore.misc().cdsBlockedUtil - System.currentTimeMillis()
+      return SignalStore.misc().isCdsBlocked && timeUntilUnblock >= PERMANENT_TIME_CUTOFF
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+package org.thoughtcrime.securesms.components.reminder
+
+import android.content.Context
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * Reminder shown when CDS is rate-limited, preventing us from temporarily doing a refresh.
+ */
+class CdsTemporyErrorReminder(context: Context) : Reminder(null, context.getString(R.string.reminder_cds_warning_body)) {
+
+  init {
+    addAction(
+      Action(
+        context.getString(R.string.reminder_cds_warning_learn_more),
+        R.id.reminder_action_cds_temporary_error_learn_more
+      )
+    )
+  }
+
+  override fun isDismissable(): Boolean {
+    return false
+  }
+
+  override fun getImportance(): Importance {
+    return Importance.ERROR
+  }
+
+  companion object {
+    @JvmStatic
+    fun isEligible(): Boolean {
+      val timeUntilUnblock = SignalStore.misc().cdsBlockedUtil - System.currentTimeMillis()
+      return SignalStore.misc().isCdsBlocked && timeUntilUnblock < CdsPermanentErrorReminder.PERMANENT_TIME_CUTOFF
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.components.reminder
+
+import android.content.Context
+import android.view.View
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.PlayStoreUtil
+
+/**
+ * Banner to update app to the latest version because of enclave failure
+ */
+class EnclaveFailureReminder(context: Context) : Reminder(
+  null,
+  context.getString(R.string.EnclaveFailureReminder_update_signal)
+) {
+
+  init {
+    addAction(Action(context.getString(R.string.ExpiredBuildReminder_update_now), R.id.reminder_action_update_now))
+    okListener = View.OnClickListener { PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(context) }
+  }
+
+  override fun isDismissable(): Boolean = false
+
+  override fun getImportance(): Importance {
+    return Importance.TERMINAL
+  }
+}

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

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileScheduleFragmentArgs
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
 import org.thoughtcrime.securesms.help.HelpFragment
 import org.thoughtcrime.securesms.keyvalue.SettingsValues
@@ -34,7 +34,7 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
 
   private var wasConfigurationUpdated = false
 
-  override val donationPaymentRepository: DonationPaymentRepository by lazy { DonationPaymentRepository(this) }
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
   override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create()
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {

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

@@ -18,9 +18,7 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.stories.Stories.isFeatureFlagEnabled
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -71,7 +69,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         }
       )
 
-      if (PlayServicesUtil.getPlayServicesStatus(requireContext()) == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
+      if (state.allowUserToGoToDonationManagementScreen) {
         clickPref(
           title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
           icon = DSLSettingsIcon.from(R.drawable.ic_heart_24),
@@ -107,15 +105,13 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         }
       )
 
-      if (isFeatureFlagEnabled()) {
-        clickPref(
-          title = DSLSettingsText.from(R.string.preferences__stories),
-          icon = DSLSettingsIcon.from(R.drawable.ic_stories_24),
-          onClick = {
-            findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
-          }
-        )
-      }
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences__stories),
+        icon = DSLSettingsIcon.from(R.drawable.ic_stories_24),
+        onClick = {
+          findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
+        }
+      )
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__notifications),

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

@@ -5,5 +5,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 data class AppSettingsState(
   val self: Recipient,
   val unreadPaymentsCount: Int,
-  val hasExpiredGiftBadge: Boolean
+  val hasExpiredGiftBadge: Boolean,
+  val allowUserToGoToDonationManagementScreen: Boolean
 )

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

@@ -2,23 +2,52 @@ package org.thoughtcrime.securesms.components.settings.app
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPaymentsLiveData
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.livedata.Store
 
-class AppSettingsViewModel : ViewModel() {
+class AppSettingsViewModel(
+  monthlyDonationRepository: MonthlyDonationRepository = MonthlyDonationRepository(ApplicationDependencies.getDonationsService())
+) : ViewModel() {
 
-  private val store = Store(AppSettingsState(Recipient.self(), 0, SignalStore.donationsValues().getExpiredGiftBadge() != null))
+  private val store = Store(
+    AppSettingsState(
+      Recipient.self(),
+      0,
+      SignalStore.donationsValues().getExpiredGiftBadge() != null,
+      SignalStore.donationsValues().isLikelyASustainer() || InAppDonations.hasAtLeastOnePaymentMethodAvailable()
+    )
+  )
 
   private val unreadPaymentsLiveData = UnreadPaymentsLiveData()
   private val selfLiveData: LiveData<Recipient> = Recipient.self().live().liveData
+  private val disposables = CompositeDisposable()
 
   val state: LiveData<AppSettingsState> = store.stateLiveData
 
   init {
     store.update(unreadPaymentsLiveData) { payments, state -> state.copy(unreadPaymentsCount = payments.map { it.unreadCount }.orElse(0)) }
     store.update(selfLiveData) { self, state -> state.copy(self = self) }
+
+    disposables += monthlyDonationRepository.getActiveSubscription().subscribeBy(
+      onSuccess = { activeSubscription ->
+        store.update { state ->
+          state.copy(allowUserToGoToDonationManagementScreen = activeSubscription.isActive || InAppDonations.hasAtLeastOnePaymentMethodAvailable())
+        }
+      },
+      onError = {}
+    )
+  }
+
+  override fun onCleared() {
+    disposables.clear()
   }
 
   fun refreshExpiredGiftBadge() {

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

@@ -44,6 +44,7 @@ import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevic
 import java.io.IOException
 import java.security.MessageDigest
 import java.security.SecureRandom
+import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantLock
 
 private val TAG: String = Log.tag(ChangeNumberRepository::class.java)
@@ -90,6 +91,7 @@ class ChangeNumberRepository(
           emitter.onComplete()
         }
     }.subscribeOn(Schedulers.single())
+      .timeout(15, TimeUnit.SECONDS)
   }
 
   fun changeNumber(code: String, newE164: String, pniUpdateMode: Boolean = false): Single<ServiceResponse<VerifyAccountResponse>> {

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

@@ -50,6 +50,7 @@ class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phon
   private fun requestCode() {
     lifecycleDisposable += viewModel
       .ensureDecryptionsDrained()
+      .onErrorComplete()
       .andThen(viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER))
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { processor ->

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

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.exporter.flow.SmsExportActivity
 import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -69,6 +70,16 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
               }
             )
 
+            clickPref(
+              title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages_again),
+              summary = DSLSettingsText.from(R.string.SmsSettingsFragment__exporting_again_can_result_in_duplicate_messages),
+              onClick = {
+                SmsExportDialogs.showSmsReExportDialog(requireContext()) {
+                  smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext(), isReExport = true))
+                }
+              }
+            )
+
             dividerPref()
           }
           SmsExportState.NO_SMS_MESSAGES_IN_DATABASE -> Unit
@@ -103,6 +114,17 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
         }
       )
 
+      if (FeatureFlags.keepMutedChatsArchived() || FeatureFlags.internalUser()) {
+        switchPref(
+          title = DSLSettingsText.from(R.string.preferences__pref_keep_muted_chats_archived),
+          summary = DSLSettingsText.from(R.string.preferences__muted_chats_that_are_archived_will_remain_archived),
+          isChecked = state.keepMutedChatsArchived,
+          onClick = {
+            viewModel.setKeepMutedChatsArchived(!state.keepMutedChatsArchived)
+          }
+        )
+      }
+
       dividerPref()
 
       sectionHeaderPref(R.string.ChatsSettingsFragment__keyboard)

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

@@ -39,4 +39,11 @@ class ChatsSettingsRepository {
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
+
+  fun syncKeepMutedChatsArchivedState() {
+    SignalExecutors.BOUNDED.execute {
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+      StorageSyncHelper.scheduleSyncForDataChange()
+    }
+  }
 }

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

@@ -5,6 +5,7 @@ import org.thoughtcrime.securesms.components.settings.app.chats.sms.SmsExportSta
 data class ChatsSettingsState(
   val generateLinkPreviews: Boolean,
   val useAddressBook: Boolean,
+  val keepMutedChatsArchived: Boolean,
   val useSystemEmoji: Boolean,
   val enterKeySends: Boolean,
   val chatBackupsEnabled: Boolean,

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

@@ -25,6 +25,7 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
     ChatsSettingsState(
       generateLinkPreviews = SignalStore.settings().isLinkPreviewsEnabled,
       useAddressBook = SignalStore.settings().isPreferSystemContactPhotos,
+      keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
       useSystemEmoji = SignalStore.settings().isPreferSystemEmoji,
       enterKeySends = SignalStore.settings().isEnterKeySends,
       chatBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication()),
@@ -57,6 +58,12 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
     repository.syncPreferSystemContactPhotos()
   }
 
+  fun setKeepMutedChatsArchived(enabled: Boolean) {
+    store.update { it.copy(keepMutedChatsArchived = enabled) }
+    SignalStore.settings().setKeepMutedChatsArchived(enabled)
+    repository.syncKeepMutedChatsArchivedState()
+  }
+
   fun setUseSystemEmoji(enabled: Boolean) {
     store.update { it.copy(useSystemEmoji = enabled) }
     SignalStore.settings().isPreferSystemEmoji = enabled

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

@@ -98,6 +98,16 @@ class SmsSettingsFragment : DSLSettingsFragment(R.string.preferences__sms_mms) {
             }
           )
 
+          clickPref(
+            title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages_again),
+            summary = DSLSettingsText.from(R.string.SmsSettingsFragment__exporting_again_can_result_in_duplicate_messages),
+            onClick = {
+              SmsExportDialogs.showSmsReExportDialog(requireContext()) {
+                smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext(), isReExport = true))
+              }
+            }
+          )
+
           dividerPref()
         }
         SmsExportState.NO_SMS_MESSAGES_IN_DATABASE -> Unit

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

@@ -88,35 +88,35 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
   private fun getConfiguration(state: InternalSettingsState): DSLConfiguration {
     return configure {
-      sectionHeaderPref(R.string.preferences__internal_account)
+      sectionHeaderPref(DSLSettingsText.from("Account"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_refresh_attributes),
-        summary = DSLSettingsText.from(R.string.preferences__internal_refresh_attributes_description),
+        title = DSLSettingsText.from("Refresh attributes"),
+        summary = DSLSettingsText.from("Forces a write of capabilities on to the server followed by a read."),
         onClick = {
           refreshAttributes()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_refresh_profile),
-        summary = DSLSettingsText.from(R.string.preferences__internal_refresh_profile_description),
+        title = DSLSettingsText.from("Refresh profile"),
+        summary = DSLSettingsText.from("Forces a refresh of your own profile."),
         onClick = {
           refreshProfile()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_rotate_profile_key),
-        summary = DSLSettingsText.from(R.string.preferences__internal_rotate_profile_key_description),
+        title = DSLSettingsText.from("Rotate profile key"),
+        summary = DSLSettingsText.from("Creates a new versioned profile, and triggers an update of any GV2 group you belong to."),
         onClick = {
           rotateProfileKey()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_refresh_remote_config),
-        summary = DSLSettingsText.from(R.string.preferences__internal_refresh_remote_config_description),
+        title = DSLSettingsText.from("Refresh remote config"),
+        summary = DSLSettingsText.from("Forces a refresh of the remote config locally instead of waiting for the elapsed time."),
         onClick = {
           refreshRemoteValues()
         }
@@ -124,11 +124,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_misc)
+      sectionHeaderPref(DSLSettingsText.from("Miscellaneous"))
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_user_details),
-        summary = DSLSettingsText.from(R.string.preferences__internal_user_details_description),
+        title = DSLSettingsText.from("'Internal Details' button"),
+        summary = DSLSettingsText.from("Show a button in conversation settings that lets you see more information about a user."),
         isChecked = state.seeMoreUserDetails,
         onClick = {
           viewModel.setSeeMoreUserDetails(!state.seeMoreUserDetails)
@@ -136,8 +136,8 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_shake_to_report),
-        summary = DSLSettingsText.from(R.string.preferences__internal_shake_to_report_description),
+        title = DSLSettingsText.from("Shake to Report"),
+        summary = DSLSettingsText.from("Shake your phone to easily submit and share a debug log."),
         isChecked = state.shakeToReport,
         onClick = {
           viewModel.setShakeToReport(!state.shakeToReport)
@@ -145,7 +145,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_keep_longer_logs),
+        title = DSLSettingsText.from("Clear keep longer logs"),
         onClick = {
           clearKeepLongerLogs()
         }
@@ -153,11 +153,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_payments)
+      sectionHeaderPref(DSLSettingsText.from("Payments"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_payment_copy_data),
-        summary = DSLSettingsText.from(R.string.preferences__internal_payment_copy_data_description),
+        title = DSLSettingsText.from("Copy payments data"),
+        summary = DSLSettingsText.from("Copy all payment records to clipboard."),
         onClick = {
           copyPaymentsDataToClipboard()
         }
@@ -165,11 +165,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_storage_service)
+      sectionHeaderPref(DSLSettingsText.from("Storage Service"))
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_disable_storage_service),
-        summary = DSLSettingsText.from(R.string.preferences__internal_disable_storage_service_description),
+        title = DSLSettingsText.from("Disable syncing"),
+        summary = DSLSettingsText.from("Prevent syncing any data to/from storage service."),
         isChecked = state.disableStorageService,
         onClick = {
           viewModel.setDisableStorageService(!state.disableStorageService)
@@ -177,16 +177,16 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_sync_now),
-        summary = DSLSettingsText.from(R.string.preferences__internal_sync_now_description),
+        title = DSLSettingsText.from("Sync now"),
+        summary = DSLSettingsText.from("Enqueue a normal storage service sync."),
         onClick = {
           enqueueStorageServiceSync()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_force_storage_service_sync),
-        summary = DSLSettingsText.from(R.string.preferences__internal_force_storage_service_sync_description),
+        title = DSLSettingsText.from("Overwrite remote data"),
+        summary = DSLSettingsText.from("Forces remote storage to match the local device state."),
         onClick = {
           enqueueStorageServiceForcePush()
         }
@@ -194,11 +194,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_preferences_groups_v2)
+      sectionHeaderPref(DSLSettingsText.from("Groups V2"))
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_force_gv2_invites),
-        summary = DSLSettingsText.from(R.string.preferences__internal_force_gv2_invites_description),
+        title = DSLSettingsText.from("Force invites"),
+        summary = DSLSettingsText.from("Members will not be added directly to a GV2 even if they could be."),
         isChecked = state.gv2forceInvites,
         onClick = {
           viewModel.setGv2ForceInvites(!state.gv2forceInvites)
@@ -206,8 +206,8 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_ignore_gv2_server_changes),
-        summary = DSLSettingsText.from(R.string.preferences__internal_ignore_gv2_server_changes_description),
+        title = DSLSettingsText.from("Ignore server changes"),
+        summary = DSLSettingsText.from("Changes in server's response will be ignored, causing passive voice update messages if P2P is also ignored."),
         isChecked = state.gv2ignoreServerChanges,
         onClick = {
           viewModel.setGv2IgnoreServerChanges(!state.gv2ignoreServerChanges)
@@ -215,8 +215,8 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_ignore_gv2_p2p_changes),
-        summary = DSLSettingsText.from(R.string.preferences__internal_ignore_gv2_server_changes_description),
+        title = DSLSettingsText.from("Ignore P2P changes"),
+        summary = DSLSettingsText.from("Changes sent P2P will be ignored. In conjunction with ignoring server changes, will cause passive voice."),
         isChecked = state.gv2ignoreP2PChanges,
         onClick = {
           viewModel.setGv2IgnoreP2PChanges(!state.gv2ignoreP2PChanges)
@@ -225,7 +225,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_network)
+      sectionHeaderPref(DSLSettingsText.from("Network"))
 
       switchPref(
         title = DSLSettingsText.from("Force websocket mode"),
@@ -247,8 +247,8 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_allow_censorship_toggle),
-        summary = DSLSettingsText.from(R.string.preferences__internal_allow_censorship_toggle_description),
+        title = DSLSettingsText.from("Allow censorship circumvention toggle"),
+        summary = DSLSettingsText.from("Allow changing the censorship circumvention toggle regardless of network connectivity."),
         isChecked = state.allowCensorshipSetting,
         onClick = {
           viewModel.setAllowCensorshipSetting(!state.allowCensorshipSetting)
@@ -257,11 +257,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_conversations_and_shortcuts)
+      sectionHeaderPref(DSLSettingsText.from("Conversations and Shortcuts"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_delete_all_dynamic_shortcuts),
-        summary = DSLSettingsText.from(R.string.preferences__internal_click_to_delete_all_dynamic_shortcuts),
+        title = DSLSettingsText.from("Delete all dynamic shortcuts"),
+        summary = DSLSettingsText.from("Click to delete all dynamic shortcuts"),
         onClick = {
           deleteAllDynamicShortcuts()
         }
@@ -269,20 +269,16 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_emoji)
+      sectionHeaderPref(DSLSettingsText.from("Emoji"))
 
       val emojiSummary = if (state.emojiVersion == null) {
-        getString(R.string.preferences__internal_use_built_in_emoji_set)
+        "Use built-in emoji set"
       } else {
-        getString(
-          R.string.preferences__internal_current_version_d_at_density_s,
-          state.emojiVersion.version,
-          state.emojiVersion.density
-        )
+        "Current version: ${state.emojiVersion.version} at density ${state.emojiVersion.density}"
       }
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_use_built_in_emoji_set),
+        title = DSLSettingsText.from("Use built-in emoji set"),
         summary = DSLSettingsText.from(emojiSummary),
         isChecked = state.useBuiltInEmojiSet,
         onClick = {
@@ -291,16 +287,16 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_force_emoji_download),
-        summary = DSLSettingsText.from(R.string.preferences__internal_force_emoji_download_description),
+        title = DSLSettingsText.from("Force emoji download"),
+        summary = DSLSettingsText.from("Download the latest emoji set if it\\'s newer than what we have."),
         onClick = {
           ApplicationDependencies.getJobManager().add(DownloadLatestEmojiDataJob(true))
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_force_search_index_download),
-        summary = DSLSettingsText.from(R.string.preferences__internal_force_search_index_download_description),
+        title = DSLSettingsText.from("Force search index download"),
+        summary = DSLSettingsText.from("Download the latest emoji search index if it\\'s newer than what we have."),
         onClick = {
           EmojiSearchIndexDownloadJob.scheduleImmediately()
         }
@@ -308,27 +304,27 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_sender_key)
+      sectionHeaderPref(DSLSettingsText.from("Sender Key"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_all_state),
-        summary = DSLSettingsText.from(R.string.preferences__internal_click_to_delete_all_sender_key_state),
+        title = DSLSettingsText.from("Clear all state"),
+        summary = DSLSettingsText.from("Click to delete all sender key state"),
         onClick = {
           clearAllSenderKeyState()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_shared_state),
-        summary = DSLSettingsText.from(R.string.preferences__internal_click_to_delete_all_sharing_state),
+        title = DSLSettingsText.from("Clear shared state"),
+        summary = DSLSettingsText.from("Click to delete all sharing state"),
         onClick = {
           clearAllSenderKeySharedState()
         }
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_remove_two_person_minimum),
-        summary = DSLSettingsText.from(R.string.preferences__internal_remove_the_requirement_that_you_need),
+        title = DSLSettingsText.from("Remove 2 person minimum"),
+        summary = DSLSettingsText.from("Remove the requirement that you  need at least 2 recipients to use sender key."),
         isChecked = state.removeSenderKeyMinimium,
         onClick = {
           viewModel.setRemoveSenderKeyMinimum(!state.removeSenderKeyMinimium)
@@ -336,8 +332,8 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_delay_resends),
-        summary = DSLSettingsText.from(R.string.preferences__internal_delay_resending_messages_in_response_to_retry_receipts),
+        title = DSLSettingsText.from("Delay resends"),
+        summary = DSLSettingsText.from("Delay resending messages in response to retry receipts by 10 seconds."),
         isChecked = state.delayResends,
         onClick = {
           viewModel.setDelayResends(!state.delayResends)
@@ -346,11 +342,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_local_metrics)
+      sectionHeaderPref(DSLSettingsText.from("Local Metrics"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_local_metrics),
-        summary = DSLSettingsText.from(R.string.preferences__internal_click_to_clear_all_local_metrics_state),
+        title = DSLSettingsText.from("Clear local metrics"),
+        summary = DSLSettingsText.from("Click to clear all local metrics state."),
         onClick = {
           clearAllLocalMetricsState()
         }
@@ -358,10 +354,10 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_calling_server)
+      sectionHeaderPref(DSLSettingsText.from("Group call server"))
 
       radioPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_calling_server_default),
+        title = DSLSettingsText.from("Default"),
         summary = DSLSettingsText.from(BuildConfig.SIGNAL_SFU_URL),
         isChecked = state.callingServer == BuildConfig.SIGNAL_SFU_URL,
         onClick = {
@@ -372,7 +368,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       BuildConfig.SIGNAL_SFU_INTERNAL_NAMES.zip(BuildConfig.SIGNAL_SFU_INTERNAL_URLS)
         .forEach { (name, server) ->
           radioPref(
-            title = DSLSettingsText.from(requireContext().getString(R.string.preferences__internal_calling_server_s, name)),
+            title = DSLSettingsText.from("$name server"),
             summary = DSLSettingsText.from(server),
             isChecked = state.callingServer == server,
             onClick = {
@@ -381,10 +377,10 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
           )
         }
 
-      sectionHeaderPref(R.string.preferences__internal_calling)
+      sectionHeaderPref(DSLSettingsText.from("Calling options"))
 
       radioListPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_calling_audio_processing_method),
+        title = DSLSettingsText.from("Audio processing method"),
         listItems = CallManager.AudioProcessingMethod.values().map { it.name }.toTypedArray(),
         selected = CallManager.AudioProcessingMethod.values().indexOf(state.callingAudioProcessingMethod),
         onSelected = {
@@ -393,7 +389,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       radioListPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_calling_bandwidth_mode),
+        title = DSLSettingsText.from("Bandwidth mode"),
         listItems = CallManager.BandwidthMode.values().map { it.name }.toTypedArray(),
         selected = CallManager.BandwidthMode.values().indexOf(state.callingBandwidthMode),
         onSelected = {
@@ -402,7 +398,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       switchPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_calling_disable_telecom),
+        title = DSLSettingsText.from("Disable Telecom integration"),
         isChecked = state.callingDisableTelecom,
         onClick = {
           viewModel.setInternalCallingDisableTelecom(!state.callingDisableTelecom)
@@ -412,24 +408,24 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       if (SignalStore.donationsValues().getSubscriber() != null) {
         dividerPref()
 
-        sectionHeaderPref(R.string.preferences__internal_badges)
+        sectionHeaderPref(DSLSettingsText.from("Badges"))
 
         clickPref(
-          title = DSLSettingsText.from(R.string.preferences__internal_badges_enqueue_redemption),
+          title = DSLSettingsText.from("Enqueue redemption."),
           onClick = {
             enqueueSubscriptionRedemption()
           }
         )
 
         clickPref(
-          title = DSLSettingsText.from(R.string.preferences__internal_badges_enqueue_keep_alive),
+          title = DSLSettingsText.from("Enqueue keep-alive."),
           onClick = {
             enqueueSubscriptionKeepAlive()
           }
         )
 
         clickPref(
-          title = DSLSettingsText.from(R.string.preferences__internal_badges_set_error_state),
+          title = DSLSettingsText.from("Set error state."),
           onClick = {
             findNavController().safeNavigate(InternalSettingsFragmentDirections.actionInternalSettingsFragmentToDonorErrorConfigurationFragment())
           }
@@ -438,17 +434,17 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_release_channel)
+      sectionHeaderPref(DSLSettingsText.from("Release channel"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_release_channel_set_last_version),
+        title = DSLSettingsText.from("Set last version seen back 10 versions"),
         onClick = {
           SignalStore.releaseChannelValues().highestVersionNoteReceived = max(SignalStore.releaseChannelValues().highestVersionNoteReceived - 10, 0)
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_reset_donation_megaphone),
+        title = DSLSettingsText.from("Reset donation megaphone"),
         onClick = {
           SignalDatabase.remoteMegaphones.debugRemoveAll()
           MegaphoneDatabase.getInstance(ApplicationDependencies.getApplication()).let {
@@ -461,7 +457,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_fetch_release_channel),
+        title = DSLSettingsText.from("Fetch release channel"),
         onClick = {
           SignalStore.releaseChannelValues().previousManifestMd5 = ByteArray(0)
           RetrieveRemoteAnnouncementsJob.enqueue(force = true)
@@ -469,7 +465,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_add_sample_note),
+        title = DSLSettingsText.from("Add sample note"),
         onClick = {
           viewModel.addSampleReleaseNote()
         }
@@ -477,27 +473,27 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences__internal_cds)
+      sectionHeaderPref(DSLSettingsText.from("CDS"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_history),
-        summary = DSLSettingsText.from(R.string.preferences__internal_clear_history_description),
+        title = DSLSettingsText.from("Clear history"),
+        summary = DSLSettingsText.from("Clears all CDS history, meaning the next sync will consider all numbers to be new."),
         onClick = {
           clearCdsHistory()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_all_service_ids),
-        summary = DSLSettingsText.from(R.string.preferences__internal_clear_all_service_ids_description),
+        title = DSLSettingsText.from("Clear all service IDs"),
+        summary = DSLSettingsText.from("Clears all known service IDs (except your own) for people that have phone numbers. Do not use on your personal device!"),
         onClick = {
           clearAllServiceIds()
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_all_profile_keys),
-        summary = DSLSettingsText.from(R.string.preferences__internal_clear_all_profile_keys_description),
+        title = DSLSettingsText.from("Clear all profile keys"),
+        summary = DSLSettingsText.from("Clears all known profile keys (except your own). Do not use on your personal device!"),
         onClick = {
           clearAllProfileKeys()
         }
@@ -505,11 +501,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       dividerPref()
 
-      sectionHeaderPref(R.string.ConversationListTabs__stories)
+      sectionHeaderPref(DSLSettingsText.from("Stories"))
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_clear_onboarding_state),
-        summary = DSLSettingsText.from(R.string.preferences__internal_clears_onboarding_flag_and_triggers_download_of_onboarding_stories),
+        title = DSLSettingsText.from("Clear onboarding state"),
+        summary = DSLSettingsText.from("Clears onboarding flag and triggers download of onboarding stories."),
         isEnabled = state.canClearOnboardingState,
         onClick = {
           viewModel.onClearOnboardingState()
@@ -517,7 +513,23 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_stories_dialog_launcher),
+        title = DSLSettingsText.from("Clear choose initial my story privacy state"),
+        isEnabled = true,
+        onClick = {
+          SignalStore.storyValues().userHasBeenNotifiedAboutStories = false
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from("Clear first time navigation state"),
+        isEnabled = true,
+        onClick = {
+          SignalStore.storyValues().userHasSeenFirstNavView = false
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from("Stories dialog launcher"),
         onClick = {
           findNavController().safeNavigate(InternalSettingsFragmentDirections.actionInternalSettingsFragmentToStoryDialogsLauncherFragment())
         }

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

@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.stories.dialogs.StoryDialogs
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
-class StoryDialogLauncherFragment : DSLSettingsFragment(titleId = R.string.preferences__internal_stories_dialog_launcher) {
+class InternalStoryDialogLauncherFragment : DSLSettingsFragment(titleId = R.string.preferences__internal_stories_dialog_launcher) {
   override fun bindAdapter(adapter: MappingAdapter) {
     adapter.submitList(getConfiguration().toMappingModelList())
   }
@@ -17,25 +17,25 @@ class StoryDialogLauncherFragment : DSLSettingsFragment(titleId = R.string.prefe
   private fun getConfiguration(): DSLConfiguration {
     return configure {
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_remove_group_story),
+        title = DSLSettingsText.from("Remove group story"),
         onClick = {
           StoryDialogs.removeGroupStory(requireContext(), "Family") {
-            Toast.makeText(requireContext(), R.string.preferences__internal_remove_group_story, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Remove group story", Toast.LENGTH_SHORT).show()
           }
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_retry_send),
+        title = DSLSettingsText.from("Retry send"),
         onClick = {
           StoryDialogs.resendStory(requireContext()) {
-            Toast.makeText(requireContext(), R.string.preferences__internal_retry_send, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Retry send", Toast.LENGTH_SHORT).show()
           }
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_story_or_profile_selector),
+        title = DSLSettingsText.from("Story or profile selector"),
         onClick = {
           StoryDialogs.displayStoryOrProfileImage(
             context = requireContext(),
@@ -46,37 +46,37 @@ class StoryDialogLauncherFragment : DSLSettingsFragment(titleId = R.string.prefe
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_hide_story),
+        title = DSLSettingsText.from("Hide story"),
         onClick = {
           StoryDialogs.hideStory(requireContext(), "Spiderman") {
-            Toast.makeText(requireContext(), R.string.preferences__internal_hide_story, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Hide story", Toast.LENGTH_SHORT).show()
           }
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_turn_off_stories),
+        title = DSLSettingsText.from("Turn off stories"),
         onClick = {
           StoryDialogs.disableStories(requireContext(), false) {
-            Toast.makeText(requireContext(), R.string.preferences__internal_turn_off_stories, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Turn off stories", Toast.LENGTH_SHORT).show()
           }
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_turn_off_stories_with_stories_on_disk),
+        title = DSLSettingsText.from("Turn off stories (with stories on disk)"),
         onClick = {
           StoryDialogs.disableStories(requireContext(), true) {
-            Toast.makeText(requireContext(), R.string.preferences__internal_turn_off_stories_with_stories_on_disk, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Turn off stories (with stories on disk)", Toast.LENGTH_SHORT).show()
           }
         }
       )
 
       clickPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_delete_custom_story),
+        title = DSLSettingsText.from("Delete custom story"),
         onClick = {
           StoryDialogs.deleteDistributionList(requireContext(), "Family") {
-            Toast.makeText(requireContext(), R.string.preferences__internal_delete_custom_story, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Delete custom story", Toast.LENGTH_SHORT).show()
           }
         }
       )

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

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components.settings.app.internal.donor
 import androidx.fragment.app.viewModels
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.donations.StripeDeclineCode
-import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
@@ -12,9 +11,9 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
-class DonorErrorConfigurationFragment : DSLSettingsFragment() {
+class InternalDonorErrorConfigurationFragment : DSLSettingsFragment() {
 
-  private val viewModel: DonorErrorConfigurationViewModel by viewModels()
+  private val viewModel: InternalDonorErrorConfigurationViewModel by viewModels()
   private val lifecycleDisposable = LifecycleDisposable()
 
   override fun bindAdapter(adapter: MappingAdapter) {
@@ -23,17 +22,17 @@ class DonorErrorConfigurationFragment : DSLSettingsFragment() {
     }
   }
 
-  private fun getConfiguration(state: DonorErrorConfigurationState): DSLConfiguration {
+  private fun getConfiguration(state: InternalDonorErrorConfigurationState): DSLConfiguration {
     return configure {
       radioListPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_donor_error_expired_badge),
+        title = DSLSettingsText.from("Expired Badge"),
         selected = state.badges.indexOf(state.selectedBadge),
         listItems = state.badges.map { it.name }.toTypedArray(),
         onSelected = { viewModel.setSelectedBadge(it) }
       )
 
       radioListPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_donor_error_cancelation_reason),
+        title = DSLSettingsText.from("Cancellation Reason"),
         selected = UnexpectedSubscriptionCancellation.values().indexOf(state.selectedUnexpectedSubscriptionCancellation),
         listItems = UnexpectedSubscriptionCancellation.values().map { it.status }.toTypedArray(),
         onSelected = { viewModel.setSelectedUnexpectedSubscriptionCancellation(it) },
@@ -41,7 +40,7 @@ class DonorErrorConfigurationFragment : DSLSettingsFragment() {
       )
 
       radioListPref(
-        title = DSLSettingsText.from(R.string.preferences__internal_donor_error_charge_failure),
+        title = DSLSettingsText.from("Charge Failure"),
         selected = StripeDeclineCode.Code.values().indexOf(state.selectedStripeDeclineCode),
         listItems = StripeDeclineCode.Code.values().map { it.code }.toTypedArray(),
         onSelected = { viewModel.setStripeDeclineCode(it) },
@@ -49,16 +48,16 @@ class DonorErrorConfigurationFragment : DSLSettingsFragment() {
       )
 
       primaryButton(
-        text = DSLSettingsText.from(R.string.preferences__internal_donor_error_save_and_finish),
+        text = DSLSettingsText.from("Save and Finish"),
         onClick = {
           lifecycleDisposable += viewModel.save().subscribe { requireActivity().finish() }
         }
       )
 
       secondaryButtonNoOutline(
-        text = DSLSettingsText.from(R.string.preferences__internal_donor_error_clear),
+        text = DSLSettingsText.from("Clear"),
         onClick = {
-          lifecycleDisposable += viewModel.clear().subscribe()
+          lifecycleDisposable += viewModel.clearErrorState().subscribe()
         }
       )
     }

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

@@ -4,7 +4,7 @@ import org.signal.donations.StripeDeclineCode
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
 
-data class DonorErrorConfigurationState(
+data class InternalDonorErrorConfigurationState(
   val badges: List<Badge> = emptyList(),
   val selectedBadge: Badge? = null,
   val selectedUnexpectedSubscriptionCancellation: UnexpectedSubscriptionCancellation? = null,

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

@@ -18,12 +18,12 @@ import org.thoughtcrime.securesms.util.rx.RxStore
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import java.util.Locale
 
-class DonorErrorConfigurationViewModel : ViewModel() {
+class InternalDonorErrorConfigurationViewModel : ViewModel() {
 
-  private val store = RxStore(DonorErrorConfigurationState())
+  private val store = RxStore(InternalDonorErrorConfigurationState())
   private val disposables = CompositeDisposable()
 
-  val state: Flowable<DonorErrorConfigurationState> = store.stateFlowable
+  val state: Flowable<InternalDonorErrorConfigurationState> = store.stateFlowable
 
   init {
     val giftBadges: Single<List<Badge>> = Single
@@ -108,10 +108,10 @@ class DonorErrorConfigurationViewModel : ViewModel() {
       }
     }.subscribeOn(Schedulers.io())
 
-    return clear().andThen(saveState)
+    return clearErrorState().andThen(saveState)
   }
 
-  fun clear(): Completable {
+  fun clearErrorState(): Completable {
     return Completable.fromAction {
       synchronized(SubscriptionReceiptRequestResponseJob.MUTEX) {
         SignalStore.donationsValues().setExpiredBadge(null)
@@ -131,20 +131,20 @@ class DonorErrorConfigurationViewModel : ViewModel() {
     }
   }
 
-  private fun handleBoostExpiration(state: DonorErrorConfigurationState) {
+  private fun handleBoostExpiration(state: InternalDonorErrorConfigurationState) {
     SignalStore.donationsValues().setExpiredBadge(state.selectedBadge)
   }
 
-  private fun handleGiftExpiration(state: DonorErrorConfigurationState) {
+  private fun handleGiftExpiration(state: InternalDonorErrorConfigurationState) {
     SignalStore.donationsValues().setExpiredGiftBadge(state.selectedBadge)
   }
 
-  private fun handleSubscriptionExpiration(state: DonorErrorConfigurationState) {
+  private fun handleSubscriptionExpiration(state: InternalDonorErrorConfigurationState) {
     SignalStore.donationsValues().setExpiredBadge(state.selectedBadge)
     handleSubscriptionPaymentFailure(state)
   }
 
-  private fun handleSubscriptionPaymentFailure(state: DonorErrorConfigurationState) {
+  private fun handleSubscriptionPaymentFailure(state: InternalDonorErrorConfigurationState) {
     SignalStore.donationsValues().unexpectedSubscriptionCancelationReason = state.selectedUnexpectedSubscriptionCancellation?.status
     SignalStore.donationsValues().unexpectedSubscriptionCancelationTimestamp = System.currentTimeMillis()
     SignalStore.donationsValues().setUnexpectedSubscriptionCancelationChargeFailure(

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

@@ -6,7 +6,7 @@ import io.reactivex.rxjava3.subjects.Subject
 import kotlinx.parcelize.Parcelize
 
 interface DonationPaymentComponent {
-  val donationPaymentRepository: DonationPaymentRepository
+  val stripeRepository: StripeRepository
   val googlePayResultPublisher: Subject<GooglePayResult>
 
   @Parcelize

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

@@ -1,426 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription
-
-import android.app.Activity
-import android.content.Intent
-import io.reactivex.rxjava3.core.Completable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.signal.core.util.concurrent.SignalExecutors
-import org.signal.core.util.logging.Log
-import org.signal.core.util.money.FiatMoney
-import org.signal.donations.GooglePayApi
-import org.signal.donations.StripeApi
-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.RecipientDatabase
-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
-import org.thoughtcrime.securesms.jobs.SubscriptionReceiptRequestResponseJob
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.subscription.LevelUpdate
-import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
-import org.thoughtcrime.securesms.subscription.Subscriber
-import org.thoughtcrime.securesms.util.Environment
-import org.thoughtcrime.securesms.util.ProfileUtil
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import org.whispersystems.signalservice.api.subscriptions.SubscriptionClientSecret
-import org.whispersystems.signalservice.internal.EmptyResponse
-import org.whispersystems.signalservice.internal.ServiceResponse
-import java.io.IOException
-import java.util.Locale
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-/**
- * Manages bindings with payment APIs
- *
- * Steps for setting up payments for a subscription:
- * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
- * 1. Generate and send a SubscriberId, which is a 32 byte ID representing this user, to Signal Service, which creates a Stripe Customer
- * 1. Create a SetupIntent via the Stripe API
- * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
- * 1. Confirm the SetupIntent via the Stripe API
- * 1. Set the default PaymentMethod for the customer, using the PaymentMethod id, via the Signal service
- *
- * For Boosts and Gifts:
- * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
- * 1. Create a PaymentIntent via the Stripe API
- * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
- * 1. Confirm the PaymentIntent via the Stripe API
- */
-class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, StripeApi.SetupIntentHelper {
-
-  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 {
-    return googlePayApi.queryIsReadyToPay()
-  }
-
-  fun scheduleSyncForAccountRecordChange() {
-    SignalExecutors.BOUNDED.execute {
-      scheduleSyncForAccountRecordChangeSync()
-    }
-  }
-
-  private fun scheduleSyncForAccountRecordChangeSync() {
-    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-    StorageSyncHelper.scheduleSyncForDataChange()
-  }
-
-  fun requestTokenFromGooglePay(price: FiatMoney, label: String, requestCode: Int) {
-    Log.d(TAG, "Requesting a token from google pay...")
-    googlePayApi.requestPayment(price, label, requestCode)
-  }
-
-  fun onActivityResult(
-    requestCode: Int,
-    resultCode: Int,
-    data: Intent?,
-    expectedRequestCode: Int,
-    paymentsRequestCallback: GooglePayApi.PaymentRequestCallback
-  ) {
-    Log.d(TAG, "Processing possible google pay result...")
-    googlePayApi.onActivityResult(requestCode, resultCode, data, expectedRequestCode, paymentsRequestCallback)
-  }
-
-  /**
-   * Verifies that the given recipient is a supported target for a gift.
-   */
-  fun verifyRecipientIsAllowedToReceiveAGift(badgeRecipient: RecipientId): Completable {
-    return Completable.fromAction {
-      Log.d(TAG, "Verifying badge recipient $badgeRecipient", true)
-      val recipient = Recipient.resolved(badgeRecipient)
-
-      if (recipient.isSelf) {
-        Log.d(TAG, "Cannot send a gift to self.", true)
-        throw DonationError.GiftRecipientVerificationError.SelectedRecipientDoesNotSupportGifts
-      }
-
-      if (recipient.isGroup || recipient.isDistributionList || recipient.registered != RecipientDatabase.RegisteredState.REGISTERED) {
-        Log.w(TAG, "Invalid badge recipient $badgeRecipient. Verification failed.", true)
-        throw DonationError.GiftRecipientVerificationError.SelectedRecipientIsInvalid
-      }
-
-      try {
-        val profile = ProfileUtil.retrieveProfileSync(ApplicationDependencies.getApplication(), recipient, SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL)
-        if (!profile.profile.capabilities.isGiftBadges) {
-          Log.w(TAG, "Badge recipient does not support gifting. Verification failed.", true)
-          throw DonationError.GiftRecipientVerificationError.SelectedRecipientDoesNotSupportGifts
-        } else {
-          Log.d(TAG, "Badge recipient supports gifting. Verification successful.", true)
-        }
-      } catch (e: IOException) {
-        Log.w(TAG, "Failed to retrieve profile for recipient.", e, true)
-        throw DonationError.GiftRecipientVerificationError.FailedToFetchProfile(e)
-      }
-    }.subscribeOn(Schedulers.io())
-  }
-
-  /**
-   * @param price             The amount to charce the local user
-   * @param paymentData       PaymentData from Google Pay that describes the payment method
-   * @param badgeRecipient    Who will be getting the badge
-   * @param additionalMessage An additional message to send along with the badge (only used if badge recipient is not self)
-   */
-  fun continuePayment(
-    price: FiatMoney,
-    paymentSource: StripeApi.PaymentSource,
-    badgeRecipient: RecipientId,
-    additionalMessage: String?,
-    badgeLevel: Long
-  ): Completable {
-    Log.d(TAG, "Creating payment intent for $price...", true)
-
-    return stripeApi.createPaymentIntent(price, badgeLevel)
-      .onErrorResumeNext {
-        if (it is DonationError) {
-          Single.error(it)
-        } else {
-          val recipient = Recipient.resolved(badgeRecipient)
-          val errorSource = if (recipient.isSelf) DonationErrorSource.BOOST else DonationErrorSource.GIFT
-          Single.error(DonationError.getPaymentSetupError(errorSource, it))
-        }
-      }
-      .flatMapCompletable { result ->
-        val recipient = Recipient.resolved(badgeRecipient)
-        val errorSource = if (recipient.isSelf) DonationErrorSource.BOOST else DonationErrorSource.GIFT
-
-        Log.d(TAG, "Created payment intent for $price.", true)
-        when (result) {
-          is StripeApi.CreatePaymentIntentResult.AmountIsTooSmall -> Completable.error(DonationError.oneTimeDonationAmountTooSmall(errorSource))
-          is StripeApi.CreatePaymentIntentResult.AmountIsTooLarge -> Completable.error(DonationError.oneTimeDonationAmountTooLarge(errorSource))
-          is StripeApi.CreatePaymentIntentResult.CurrencyIsNotSupported -> Completable.error(DonationError.invalidCurrencyForOneTimeDonation(errorSource))
-          is StripeApi.CreatePaymentIntentResult.Success -> confirmPayment(price, paymentSource, result.paymentIntent, badgeRecipient, additionalMessage, badgeLevel)
-        }
-      }.subscribeOn(Schedulers.io())
-  }
-
-  fun continueSubscriptionSetup(paymentSource: StripeApi.PaymentSource): Completable {
-    Log.d(TAG, "Continuing subscription setup...", true)
-    return stripeApi.createSetupIntent()
-      .flatMapCompletable { result ->
-        Log.d(TAG, "Retrieved SetupIntent, confirming...", true)
-        stripeApi.confirmSetupIntent(paymentSource, result.setupIntent).doOnComplete {
-          Log.d(TAG, "Confirmed SetupIntent...", true)
-        }
-      }
-  }
-
-  fun cancelActiveSubscription(): Completable {
-    Log.d(TAG, "Canceling active subscription...", true)
-    val localSubscriber = SignalStore.donationsValues().requireSubscriber()
-    return Single
-      .fromCallable {
-        ApplicationDependencies.getDonationsService()
-          .cancelSubscription(localSubscriber.subscriberId)
-      }
-      .subscribeOn(Schedulers.io())
-      .flatMap(ServiceResponse<EmptyResponse>::flattenResult)
-      .ignoreElement()
-      .doOnComplete { Log.d(TAG, "Cancelled active subscription.", true) }
-  }
-
-  fun ensureSubscriberId(): Completable {
-    Log.d(TAG, "Ensuring SubscriberId exists on Signal service...", true)
-    val subscriberId = SignalStore.donationsValues().getSubscriber()?.subscriberId ?: SubscriberId.generate()
-    return Single
-      .fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
-          .putSubscription(subscriberId)
-      }
-      .subscribeOn(Schedulers.io())
-      .flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement()
-      .doOnComplete {
-        Log.d(TAG, "Successfully set SubscriberId exists on Signal service.", true)
-
-        SignalStore
-          .donationsValues()
-          .setSubscriber(Subscriber(subscriberId, SignalStore.donationsValues().getSubscriptionCurrency().currencyCode))
-
-        scheduleSyncForAccountRecordChangeSync()
-      }
-  }
-
-  private fun confirmPayment(price: FiatMoney, paymentSource: StripeApi.PaymentSource, paymentIntent: StripeApi.PaymentIntent, badgeRecipient: RecipientId, additionalMessage: String?, badgeLevel: Long): Completable {
-    val isBoost = badgeRecipient == Recipient.self().id
-    val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.BOOST else DonationErrorSource.GIFT
-
-    Log.d(TAG, "Confirming payment intent...", true)
-    val confirmPayment = stripeApi.confirmPaymentIntent(paymentSource, paymentIntent).onErrorResumeNext {
-      Completable.error(DonationError.getPaymentSetupError(donationErrorSource, it))
-    }
-
-    val waitOnRedemption = Completable.create {
-      val donationReceiptRecord = if (isBoost) {
-        DonationReceiptRecord.createForBoost(price)
-      } else {
-        DonationReceiptRecord.createForGift(price)
-      }
-
-      val donationTypeLabel = donationReceiptRecord.type.code.replaceFirstChar { c -> if (c.isLowerCase()) c.titlecase(Locale.US) else c.toString() }
-
-      Log.d(TAG, "Confirmed payment intent. Recording $donationTypeLabel receipt and submitting badge reimbursement job chain.", true)
-      SignalDatabase.donationReceipts.addReceipt(donationReceiptRecord)
-
-      val countDownLatch = CountDownLatch(1)
-      var finalJobState: JobTracker.JobState? = null
-      val chain = if (isBoost) {
-        BoostReceiptRequestResponseJob.createJobChainForBoost(paymentIntent)
-      } else {
-        BoostReceiptRequestResponseJob.createJobChainForGift(paymentIntent, badgeRecipient, additionalMessage, badgeLevel)
-      }
-
-      chain.enqueue { _, jobState ->
-        if (jobState.isComplete) {
-          finalJobState = jobState
-          countDownLatch.countDown()
-        }
-      }
-
-      try {
-        if (countDownLatch.await(10, TimeUnit.SECONDS)) {
-          when (finalJobState) {
-            JobTracker.JobState.SUCCESS -> {
-              Log.d(TAG, "$donationTypeLabel request response job chain succeeded.", true)
-              it.onComplete()
-            }
-            JobTracker.JobState.FAILURE -> {
-              Log.d(TAG, "$donationTypeLabel request response job chain failed permanently.", true)
-              it.onError(DonationError.genericBadgeRedemptionFailure(donationErrorSource))
-            }
-            else -> {
-              Log.d(TAG, "$donationTypeLabel request response job chain ignored due to in-progress jobs.", true)
-              it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
-            }
-          }
-        } else {
-          Log.d(TAG, "$donationTypeLabel job chain timed out waiting for job completion.", true)
-          it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
-        }
-      } catch (e: InterruptedException) {
-        Log.d(TAG, "$donationTypeLabel job chain interrupted", e, true)
-        it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
-      }
-    }
-
-    return confirmPayment.andThen(waitOnRedemption)
-  }
-
-  fun setSubscriptionLevel(subscriptionLevel: String): Completable {
-    return getOrCreateLevelUpdateOperation(subscriptionLevel)
-      .flatMapCompletable { levelUpdateOperation ->
-        val subscriber = SignalStore.donationsValues().requireSubscriber()
-
-        Log.d(TAG, "Attempting to set user subscription level to $subscriptionLevel", true)
-        Single
-          .fromCallable {
-            ApplicationDependencies.getDonationsService().updateSubscriptionLevel(
-              subscriber.subscriberId,
-              subscriptionLevel,
-              subscriber.currencyCode,
-              levelUpdateOperation.idempotencyKey.serialize(),
-              SubscriptionReceiptRequestResponseJob.MUTEX
-            )
-          }
-          .flatMapCompletable {
-            if (it.status == 200 || it.status == 204) {
-              Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
-              SignalStore.donationsValues().updateLocalStateForLocalSubscribe()
-              scheduleSyncForAccountRecordChange()
-              LevelUpdate.updateProcessingState(false)
-              Completable.complete()
-            } else {
-              if (it.applicationError.isPresent) {
-                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
-                SignalStore.donationsValues().clearLevelOperations()
-              } else {
-                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
-              }
-
-              LevelUpdate.updateProcessingState(false)
-              it.flattenResult().ignoreElement()
-            }
-          }.andThen {
-            Log.d(TAG, "Enqueuing request response job chain.", true)
-            val countDownLatch = CountDownLatch(1)
-            var finalJobState: JobTracker.JobState? = null
-
-            SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue { _, jobState ->
-              if (jobState.isComplete) {
-                finalJobState = jobState
-                countDownLatch.countDown()
-              }
-            }
-
-            try {
-              if (countDownLatch.await(10, TimeUnit.SECONDS)) {
-                when (finalJobState) {
-                  JobTracker.JobState.SUCCESS -> {
-                    Log.d(TAG, "Subscription request response job chain succeeded.", true)
-                    it.onComplete()
-                  }
-                  JobTracker.JobState.FAILURE -> {
-                    Log.d(TAG, "Subscription request response job chain failed permanently.", true)
-                    it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION))
-                  }
-                  else -> {
-                    Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true)
-                    it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
-                  }
-                }
-              } else {
-                Log.d(TAG, "Subscription request response job timed out.", true)
-                it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
-              }
-            } catch (e: InterruptedException) {
-              Log.w(TAG, "Subscription request response interrupted.", e, true)
-              it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
-            }
-          }
-      }.doOnError {
-        LevelUpdate.updateProcessingState(false)
-      }.subscribeOn(Schedulers.io())
-  }
-
-  private fun getOrCreateLevelUpdateOperation(subscriptionLevel: String): Single<LevelUpdateOperation> = Single.fromCallable {
-    Log.d(TAG, "Retrieving level update operation for $subscriptionLevel")
-    val levelUpdateOperation = SignalStore.donationsValues().getLevelOperation(subscriptionLevel)
-    if (levelUpdateOperation == null) {
-      val newOperation = LevelUpdateOperation(
-        idempotencyKey = IdempotencyKey.generate(),
-        level = subscriptionLevel
-      )
-
-      SignalStore.donationsValues().setLevelOperation(newOperation)
-      LevelUpdate.updateProcessingState(true)
-      Log.d(TAG, "Created a new operation for $subscriptionLevel")
-      newOperation
-    } else {
-      LevelUpdate.updateProcessingState(true)
-      Log.d(TAG, "Reusing operation for $subscriptionLevel")
-      levelUpdateOperation
-    }
-  }
-
-  override fun fetchPaymentIntent(price: FiatMoney, level: Long): Single<StripeApi.PaymentIntent> {
-    Log.d(TAG, "Fetching payment intent from Signal service for $price... (Locale.US minimum precision: ${price.minimumUnitPrecisionString})")
-    return Single
-      .fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
-          .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level)
-      }
-      .flatMap(ServiceResponse<SubscriptionClientSecret>::flattenResult)
-      .map {
-        StripeApi.PaymentIntent(it.id, it.clientSecret)
-      }.doOnSuccess {
-        Log.d(TAG, "Got payment intent from Signal service!")
-      }
-  }
-
-  override fun fetchSetupIntent(): Single<StripeApi.SetupIntent> {
-    Log.d(TAG, "Fetching setup intent from Signal service...")
-    return Single.fromCallable { SignalStore.donationsValues().requireSubscriber() }
-      .flatMap {
-        Single.fromCallable {
-          ApplicationDependencies
-            .getDonationsService()
-            .createSubscriptionPaymentMethod(it.subscriberId)
-        }
-      }
-      .flatMap(ServiceResponse<SubscriptionClientSecret>::flattenResult)
-      .map { StripeApi.SetupIntent(it.id, it.clientSecret) }
-      .doOnSuccess {
-        Log.d(TAG, "Got setup intent from Signal service!")
-      }
-  }
-
-  override fun setDefaultPaymentMethod(paymentMethodId: String): Completable {
-    Log.d(TAG, "Setting default payment method via Signal service...")
-    return Single.fromCallable {
-      SignalStore.donationsValues().requireSubscriber()
-    }.flatMap {
-      Single.fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
-          .setDefaultPaymentMethodId(it.subscriberId, paymentMethodId)
-      }
-    }.flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement().doOnComplete {
-      Log.d(TAG, "Set default payment method via Signal service!")
-    }
-  }
-
-  companion object {
-    private val TAG = Log.tag(DonationPaymentRepository::class.java)
-  }
-}

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

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.LocaleFeatureFlags
+import org.thoughtcrime.securesms.util.PlayServicesUtil
+
+/**
+ * Helper object to determine in-app donations availability.
+ */
+object InAppDonations {
+
+  /**
+   * The user is:
+   *
+   * - Able to use Credit Cards and is in a region where they are able to be accepted.
+   * - Able to access Google Play services (and thus possibly able to use Google Pay).
+   * - Able to use PayPal and is in a region where it is able to be accepted.
+   */
+  fun hasAtLeastOnePaymentMethodAvailable(): Boolean {
+    return isCreditCardAvailable() || isPayPalAvailable() || isGooglePayAvailable()
+  }
+
+  /**
+   * Whether the user is in a region that supports credit cards, based off local phone number.
+   */
+  fun isCreditCardAvailable(): Boolean {
+    return FeatureFlags.creditCardPayments() && !LocaleFeatureFlags.isCreditCardDisabled()
+  }
+
+  /**
+   * Whether the user is in a region that supports PayPal, based off local phone number.
+   */
+  fun isPayPalAvailable(): Boolean {
+    return false
+  }
+
+  /**
+   * Whether the user is in a region that supports GooglePay, based off local phone number.
+   */
+  private fun isGooglePayAvailable(): Boolean {
+    return isPlayServicesAvailable() && !LocaleFeatureFlags.isGooglePayDisabled()
+  }
+
+  /**
+   * Whether Play Services is available. This will *not* tell you whether a user has Google Pay set up, but is
+   * enough information to determine whether we can display Google Pay as an option.
+   */
+  private fun isPlayServicesAvailable(): Boolean {
+    return PlayServicesUtil.getPlayServicesStatus(ApplicationDependencies.getApplication()) == PlayServicesUtil.PlayServicesStatus.SUCCESS
+  }
+}

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

@@ -0,0 +1,229 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.badges.Badges
+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.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobmanager.JobTracker
+import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
+import org.thoughtcrime.securesms.jobs.SubscriptionReceiptRequestResponseJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.subscription.LevelUpdate
+import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
+import org.thoughtcrime.securesms.subscription.Subscriber
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import org.whispersystems.signalservice.api.subscriptions.SubscriptionLevels
+import org.whispersystems.signalservice.internal.EmptyResponse
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.util.Currency
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/**
+ * Repository which can query for the user's active subscription as well as a list of available subscriptions,
+ * in the currency indicated.
+ */
+class MonthlyDonationRepository(private val donationsService: DonationsService) {
+
+  private val TAG = Log.tag(MonthlyDonationRepository::class.java)
+
+  fun getActiveSubscription(): Single<ActiveSubscription> {
+    val localSubscription = SignalStore.donationsValues().getSubscriber()
+    return if (localSubscription != null) {
+      Single.fromCallable { donationsService.getSubscription(localSubscription.subscriberId) }
+        .subscribeOn(Schedulers.io())
+        .flatMap(ServiceResponse<ActiveSubscription>::flattenResult)
+    } else {
+      Single.just(ActiveSubscription.EMPTY)
+    }
+  }
+
+  fun getSubscriptions(): Single<List<Subscription>> = Single
+    .fromCallable { donationsService.getSubscriptionLevels(Locale.getDefault()) }
+    .subscribeOn(Schedulers.io())
+    .flatMap(ServiceResponse<SubscriptionLevels>::flattenResult)
+    .map { subscriptionLevels ->
+      subscriptionLevels.levels.map { (code, level) ->
+        Subscription(
+          id = code,
+          name = level.name,
+          badge = Badges.fromServiceBadge(level.badge),
+          prices = level.currencies.filter {
+            PlatformCurrencyUtil
+              .getAvailableCurrencyCodes()
+              .contains(it.key)
+          }.map { (currencyCode, price) ->
+            FiatMoney(price, Currency.getInstance(currencyCode))
+          }.toSet(),
+          level = code.toInt()
+        )
+      }.sortedBy {
+        it.level
+      }
+    }
+
+  fun syncAccountRecord(): Completable {
+    return Completable.fromAction {
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+      StorageSyncHelper.scheduleSyncForDataChange()
+    }.subscribeOn(Schedulers.io())
+  }
+
+  fun ensureSubscriberId(): Completable {
+    Log.d(TAG, "Ensuring SubscriberId exists on Signal service...", true)
+    val subscriberId = SignalStore.donationsValues().getSubscriber()?.subscriberId ?: SubscriberId.generate()
+    return Single
+      .fromCallable {
+        donationsService.putSubscription(subscriberId)
+      }
+      .subscribeOn(Schedulers.io())
+      .flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement()
+      .doOnComplete {
+        Log.d(TAG, "Successfully set SubscriberId exists on Signal service.", true)
+
+        SignalStore
+          .donationsValues()
+          .setSubscriber(Subscriber(subscriberId, SignalStore.donationsValues().getSubscriptionCurrency().currencyCode))
+
+        SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+        StorageSyncHelper.scheduleSyncForDataChange()
+      }
+  }
+
+  fun cancelActiveSubscription(): Completable {
+    Log.d(TAG, "Canceling active subscription...", true)
+    val localSubscriber = SignalStore.donationsValues().requireSubscriber()
+    return Single
+      .fromCallable {
+        donationsService.cancelSubscription(localSubscriber.subscriberId)
+      }
+      .subscribeOn(Schedulers.io())
+      .flatMap(ServiceResponse<EmptyResponse>::flattenResult)
+      .ignoreElement()
+      .doOnComplete { Log.d(TAG, "Cancelled active subscription.", true) }
+  }
+
+  fun cancelActiveSubscriptionIfNecessary(): Completable {
+    return Single.just(SignalStore.donationsValues().shouldCancelSubscriptionBeforeNextSubscribeAttempt).flatMapCompletable {
+      if (it) {
+        Log.d(TAG, "Cancelling active subscription...", true)
+        cancelActiveSubscription().doOnComplete {
+          SignalStore.donationsValues().updateLocalStateForManualCancellation()
+          MultiDeviceSubscriptionSyncRequestJob.enqueue()
+        }
+      } else {
+        Completable.complete()
+      }
+    }
+  }
+
+  fun setSubscriptionLevel(subscriptionLevel: String): Completable {
+    return getOrCreateLevelUpdateOperation(subscriptionLevel)
+      .flatMapCompletable { levelUpdateOperation ->
+        val subscriber = SignalStore.donationsValues().requireSubscriber()
+
+        Log.d(TAG, "Attempting to set user subscription level to $subscriptionLevel", true)
+        Single
+          .fromCallable {
+            ApplicationDependencies.getDonationsService().updateSubscriptionLevel(
+              subscriber.subscriberId,
+              subscriptionLevel,
+              subscriber.currencyCode,
+              levelUpdateOperation.idempotencyKey.serialize(),
+              SubscriptionReceiptRequestResponseJob.MUTEX
+            )
+          }
+          .flatMapCompletable {
+            if (it.status == 200 || it.status == 204) {
+              Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
+              SignalStore.donationsValues().updateLocalStateForLocalSubscribe()
+              syncAccountRecord().subscribe()
+              LevelUpdate.updateProcessingState(false)
+              Completable.complete()
+            } else {
+              if (it.applicationError.isPresent) {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
+                SignalStore.donationsValues().clearLevelOperations()
+              } else {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
+              }
+
+              LevelUpdate.updateProcessingState(false)
+              it.flattenResult().ignoreElement()
+            }
+          }.andThen {
+            Log.d(TAG, "Enqueuing request response job chain.", true)
+            val countDownLatch = CountDownLatch(1)
+            var finalJobState: JobTracker.JobState? = null
+
+            SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue { _, jobState ->
+              if (jobState.isComplete) {
+                finalJobState = jobState
+                countDownLatch.countDown()
+              }
+            }
+
+            try {
+              if (countDownLatch.await(10, TimeUnit.SECONDS)) {
+                when (finalJobState) {
+                  JobTracker.JobState.SUCCESS -> {
+                    Log.d(TAG, "Subscription request response job chain succeeded.", true)
+                    it.onComplete()
+                  }
+                  JobTracker.JobState.FAILURE -> {
+                    Log.d(TAG, "Subscription request response job chain failed permanently.", true)
+                    it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION))
+                  }
+                  else -> {
+                    Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true)
+                    it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
+                  }
+                }
+              } else {
+                Log.d(TAG, "Subscription request response job timed out.", true)
+                it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
+              }
+            } catch (e: InterruptedException) {
+              Log.w(TAG, "Subscription request response interrupted.", e, true)
+              it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
+            }
+          }
+      }.doOnError {
+        LevelUpdate.updateProcessingState(false)
+      }.subscribeOn(Schedulers.io())
+  }
+
+  private fun getOrCreateLevelUpdateOperation(subscriptionLevel: String): Single<LevelUpdateOperation> = Single.fromCallable {
+    Log.d(TAG, "Retrieving level update operation for $subscriptionLevel")
+    val levelUpdateOperation = SignalStore.donationsValues().getLevelOperation(subscriptionLevel)
+    if (levelUpdateOperation == null) {
+      val newOperation = LevelUpdateOperation(
+        idempotencyKey = IdempotencyKey.generate(),
+        level = subscriptionLevel
+      )
+
+      SignalStore.donationsValues().setLevelOperation(newOperation)
+      LevelUpdate.updateProcessingState(true)
+      Log.d(TAG, "Created a new operation for $subscriptionLevel")
+      newOperation
+    } else {
+      LevelUpdate.updateProcessingState(true)
+      Log.d(TAG, "Reusing operation for $subscriptionLevel")
+      levelUpdateOperation
+    }
+  }
+}

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

@@ -0,0 +1,124 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
+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
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
+import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.math.BigDecimal
+import java.util.Currency
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class OneTimeDonationRepository(private val donationsService: DonationsService) {
+
+  companion object {
+    private val TAG = Log.tag(OneTimeDonationRepository::class.java)
+  }
+
+  fun getBoosts(): Single<Map<Currency, List<Boost>>> {
+    return Single.fromCallable { donationsService.boostAmounts }
+      .subscribeOn(Schedulers.io())
+      .flatMap(ServiceResponse<Map<String, List<BigDecimal>>>::flattenResult)
+      .map { result ->
+        result
+          .filter { PlatformCurrencyUtil.getAvailableCurrencyCodes().contains(it.key) }
+          .mapKeys { (code, _) -> Currency.getInstance(code) }
+          .mapValues { (currency, prices) -> prices.map { Boost(FiatMoney(it, currency)) } }
+      }
+  }
+
+  fun getBoostBadge(): Single<Badge> {
+    return Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getBoostBadge(Locale.getDefault())
+      }
+      .subscribeOn(Schedulers.io())
+      .flatMap(ServiceResponse<SignalServiceProfile.Badge>::flattenResult)
+      .map(Badges::fromServiceBadge)
+  }
+
+  fun waitForOneTimeRedemption(
+    price: FiatMoney,
+    paymentIntentId: String,
+    badgeRecipient: RecipientId,
+    additionalMessage: String?,
+    badgeLevel: Long,
+  ): Completable {
+    val isBoost = badgeRecipient == Recipient.self().id
+    val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.BOOST else DonationErrorSource.GIFT
+
+    val waitOnRedemption = Completable.create {
+      val donationReceiptRecord = if (isBoost) {
+        DonationReceiptRecord.createForBoost(price)
+      } else {
+        DonationReceiptRecord.createForGift(price)
+      }
+
+      val donationTypeLabel = donationReceiptRecord.type.code.replaceFirstChar { c -> if (c.isLowerCase()) c.titlecase(Locale.US) else c.toString() }
+
+      Log.d(TAG, "Confirmed payment intent. Recording $donationTypeLabel receipt and submitting badge reimbursement job chain.", true)
+      SignalDatabase.donationReceipts.addReceipt(donationReceiptRecord)
+
+      val countDownLatch = CountDownLatch(1)
+      var finalJobState: JobTracker.JobState? = null
+      val chain = if (isBoost) {
+        BoostReceiptRequestResponseJob.createJobChainForBoost(paymentIntentId)
+      } else {
+        BoostReceiptRequestResponseJob.createJobChainForGift(paymentIntentId, badgeRecipient, additionalMessage, badgeLevel)
+      }
+
+      chain.enqueue { _, jobState ->
+        if (jobState.isComplete) {
+          finalJobState = jobState
+          countDownLatch.countDown()
+        }
+      }
+
+      try {
+        if (countDownLatch.await(10, TimeUnit.SECONDS)) {
+          when (finalJobState) {
+            JobTracker.JobState.SUCCESS -> {
+              Log.d(TAG, "$donationTypeLabel request response job chain succeeded.", true)
+              it.onComplete()
+            }
+            JobTracker.JobState.FAILURE -> {
+              Log.d(TAG, "$donationTypeLabel request response job chain failed permanently.", true)
+              it.onError(DonationError.genericBadgeRedemptionFailure(donationErrorSource))
+            }
+            else -> {
+              Log.d(TAG, "$donationTypeLabel request response job chain ignored due to in-progress jobs.", true)
+              it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
+            }
+          }
+        } else {
+          Log.d(TAG, "$donationTypeLabel job chain timed out waiting for job completion.", true)
+          it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
+        }
+      } catch (e: InterruptedException) {
+        Log.d(TAG, "$donationTypeLabel job chain interrupted", e, true)
+        it.onError(DonationError.timeoutWaitingForToken(donationErrorSource))
+      }
+    }
+
+    return waitOnRedemption
+  }
+}

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

@@ -0,0 +1,243 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.app.Activity
+import android.content.Intent
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.GooglePayApi
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.signal.donations.json.StripeIntentStatus
+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.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.util.Environment
+import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret
+import org.whispersystems.signalservice.internal.EmptyResponse
+import org.whispersystems.signalservice.internal.ServiceResponse
+
+/**
+ * Manages bindings with payment APIs
+ *
+ * Steps for setting up payments for a subscription:
+ * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
+ * 1. Generate and send a SubscriberId, which is a 32 byte ID representing this user, to Signal Service, which creates a Stripe Customer
+ * 1. Create a SetupIntent via the Stripe API
+ * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
+ * 1. Confirm the SetupIntent via the Stripe API
+ * 1. Set the default PaymentMethod for the customer, using the PaymentMethod id, via the Signal service
+ *
+ * For Boosts and Gifts:
+ * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
+ * 1. Create a PaymentIntent via the Stripe API
+ * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
+ * 1. Confirm the PaymentIntent via the Stripe API
+ */
+class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, StripeApi.SetupIntentHelper {
+
+  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 {
+    return googlePayApi.queryIsReadyToPay()
+  }
+
+  fun scheduleSyncForAccountRecordChange() {
+    SignalExecutors.BOUNDED.execute {
+      scheduleSyncForAccountRecordChangeSync()
+    }
+  }
+
+  private fun scheduleSyncForAccountRecordChangeSync() {
+    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+    StorageSyncHelper.scheduleSyncForDataChange()
+  }
+
+  fun requestTokenFromGooglePay(price: FiatMoney, label: String, requestCode: Int) {
+    Log.d(TAG, "Requesting a token from google pay...")
+    googlePayApi.requestPayment(price, label, requestCode)
+  }
+
+  fun onActivityResult(
+    requestCode: Int,
+    resultCode: Int,
+    data: Intent?,
+    expectedRequestCode: Int,
+    paymentsRequestCallback: GooglePayApi.PaymentRequestCallback
+  ) {
+    Log.d(TAG, "Processing possible google pay result...")
+    googlePayApi.onActivityResult(requestCode, resultCode, data, expectedRequestCode, paymentsRequestCallback)
+  }
+
+  /**
+   * @param price             The amount to charce the local user
+   * @param badgeRecipient    Who will be getting the badge
+   */
+  fun continuePayment(
+    price: FiatMoney,
+    badgeRecipient: RecipientId,
+    badgeLevel: Long,
+  ): Single<StripeIntentAccessor> {
+    Log.d(TAG, "Creating payment intent for $price...", true)
+
+    return stripeApi.createPaymentIntent(price, badgeLevel)
+      .onErrorResumeNext {
+        handleCreatePaymentIntentError(it, badgeRecipient)
+      }
+      .flatMap { result ->
+        val recipient = Recipient.resolved(badgeRecipient)
+        val errorSource = if (recipient.isSelf) DonationErrorSource.BOOST else DonationErrorSource.GIFT
+
+        Log.d(TAG, "Created payment intent for $price.", true)
+        when (result) {
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooSmall -> Single.error(DonationError.oneTimeDonationAmountTooSmall(errorSource))
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooLarge -> Single.error(DonationError.oneTimeDonationAmountTooLarge(errorSource))
+          is StripeApi.CreatePaymentIntentResult.CurrencyIsNotSupported -> Single.error(DonationError.invalidCurrencyForOneTimeDonation(errorSource))
+          is StripeApi.CreatePaymentIntentResult.Success -> Single.just(result.paymentIntent)
+        }
+      }.subscribeOn(Schedulers.io())
+  }
+
+  fun createAndConfirmSetupIntent(paymentSource: StripeApi.PaymentSource): Single<StripeApi.Secure3DSAction> {
+    Log.d(TAG, "Continuing subscription setup...", true)
+    return stripeApi.createSetupIntent()
+      .flatMap { result ->
+        Log.d(TAG, "Retrieved SetupIntent, confirming...", true)
+        stripeApi.confirmSetupIntent(paymentSource, result.setupIntent)
+      }
+  }
+
+  fun confirmPayment(
+    paymentSource: StripeApi.PaymentSource,
+    paymentIntent: StripeIntentAccessor,
+    badgeRecipient: RecipientId
+  ): Single<StripeApi.Secure3DSAction> {
+    val isBoost = badgeRecipient == Recipient.self().id
+    val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.BOOST else DonationErrorSource.GIFT
+
+    Log.d(TAG, "Confirming payment intent...", true)
+    return stripeApi.confirmPaymentIntent(paymentSource, paymentIntent)
+      .onErrorResumeNext {
+        Single.error(DonationError.getPaymentSetupError(donationErrorSource, it))
+      }
+  }
+
+  override fun fetchPaymentIntent(price: FiatMoney, level: Long): Single<StripeIntentAccessor> {
+    Log.d(TAG, "Fetching payment intent from Signal service for $price... (Locale.US minimum precision: ${price.minimumUnitPrecisionString})")
+    return Single
+      .fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level)
+      }
+      .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
+      .map {
+        StripeIntentAccessor(
+          objectType = StripeIntentAccessor.ObjectType.PAYMENT_INTENT,
+          intentId = it.id,
+          intentClientSecret = it.clientSecret
+        )
+      }.doOnSuccess {
+        Log.d(TAG, "Got payment intent from Signal service!")
+      }
+  }
+
+  override fun fetchSetupIntent(): Single<StripeIntentAccessor> {
+    Log.d(TAG, "Fetching setup intent from Signal service...")
+    return Single.fromCallable { SignalStore.donationsValues().requireSubscriber() }
+      .flatMap {
+        Single.fromCallable {
+          ApplicationDependencies
+            .getDonationsService()
+            .createStripeSubscriptionPaymentMethod(it.subscriberId)
+        }
+      }
+      .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
+      .map {
+        StripeIntentAccessor(
+          objectType = StripeIntentAccessor.ObjectType.SETUP_INTENT,
+          intentId = it.id,
+          intentClientSecret = it.clientSecret
+        )
+      }
+      .doOnSuccess {
+        Log.d(TAG, "Got setup intent from Signal service!")
+      }
+  }
+
+  /**
+   * Note: There seem to be times when PaymentIntent does not return a status. In these cases, we assume
+   *       that we are successful and proceed as normal. If the payment didn't actually succeed, then we
+   *       expect an error later in the chain to inform us of this.
+   */
+  fun getStatusAndPaymentMethodId(stripeIntentAccessor: StripeIntentAccessor): Single<StatusAndPaymentMethodId> {
+    return Single.fromCallable {
+      when (stripeIntentAccessor.objectType) {
+        StripeIntentAccessor.ObjectType.NONE -> StatusAndPaymentMethodId(StripeIntentStatus.SUCCEEDED, null)
+        StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> stripeApi.getPaymentIntent(stripeIntentAccessor).let {
+          if (it.status == null) {
+            Log.d(TAG, "Returned payment intent had a null status.", true)
+          }
+          StatusAndPaymentMethodId(it.status ?: StripeIntentStatus.SUCCEEDED, it.paymentMethod)
+        }
+        StripeIntentAccessor.ObjectType.SETUP_INTENT -> stripeApi.getSetupIntent(stripeIntentAccessor).let {
+          StatusAndPaymentMethodId(it.status, it.paymentMethod)
+        }
+      }
+    }
+  }
+
+  fun setDefaultPaymentMethod(paymentMethodId: String): Completable {
+    return Single.fromCallable {
+      Log.d(TAG, "Getting the subscriber...")
+      SignalStore.donationsValues().requireSubscriber()
+    }.flatMap {
+      Log.d(TAG, "Setting default payment method via Signal service...")
+      Single.fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .setDefaultStripePaymentMethod(it.subscriberId, paymentMethodId)
+      }
+    }.flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement().doOnComplete {
+      Log.d(TAG, "Set default payment method via Signal service!")
+    }
+  }
+
+  fun createCreditCardPaymentSource(donationErrorSource: DonationErrorSource, cardData: StripeApi.CardData): Single<StripeApi.PaymentSource> {
+    Log.d(TAG, "Creating credit card payment source via Stripe api...")
+    return stripeApi.createPaymentSourceFromCardData(cardData).map {
+      when (it) {
+        is StripeApi.CreatePaymentSourceFromCardDataResult.Failure -> throw DonationError.getPaymentSetupError(donationErrorSource, it.reason)
+        is StripeApi.CreatePaymentSourceFromCardDataResult.Success -> it.paymentSource
+      }
+    }
+  }
+
+  data class StatusAndPaymentMethodId(
+    val status: StripeIntentStatus,
+    val paymentMethod: String?
+  )
+
+  companion object {
+    private val TAG = Log.tag(StripeRepository::class.java)
+
+    fun <T> handleCreatePaymentIntentError(throwable: Throwable, badgeRecipient: RecipientId): Single<T> {
+      return if (throwable is DonationError) {
+        Single.error(throwable)
+      } else {
+        val recipient = Recipient.resolved(badgeRecipient)
+        val errorSource = if (recipient.isSelf) DonationErrorSource.BOOST else DonationErrorSource.GIFT
+        Single.error(DonationError.getPaymentSetupError(errorSource, throwable))
+      }
+    }
+  }
+}

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

@@ -1,68 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription
-
-import io.reactivex.rxjava3.core.Completable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.signal.core.util.money.FiatMoney
-import org.thoughtcrime.securesms.badges.Badges
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.subscription.Subscription
-import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
-import org.whispersystems.signalservice.api.services.DonationsService
-import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
-import org.whispersystems.signalservice.api.subscriptions.SubscriptionLevels
-import org.whispersystems.signalservice.internal.ServiceResponse
-import java.util.Currency
-import java.util.Locale
-
-/**
- * Repository which can query for the user's active subscription as well as a list of available subscriptions,
- * in the currency indicated.
- */
-class SubscriptionsRepository(private val donationsService: DonationsService) {
-
-  fun getActiveSubscription(): Single<ActiveSubscription> {
-    val localSubscription = SignalStore.donationsValues().getSubscriber()
-    return if (localSubscription != null) {
-      Single.fromCallable { donationsService.getSubscription(localSubscription.subscriberId) }
-        .subscribeOn(Schedulers.io())
-        .flatMap(ServiceResponse<ActiveSubscription>::flattenResult)
-    } else {
-      Single.just(ActiveSubscription.EMPTY)
-    }
-  }
-
-  fun getSubscriptions(): Single<List<Subscription>> = Single
-    .fromCallable { donationsService.getSubscriptionLevels(Locale.getDefault()) }
-    .subscribeOn(Schedulers.io())
-    .flatMap(ServiceResponse<SubscriptionLevels>::flattenResult)
-    .map { subscriptionLevels ->
-      subscriptionLevels.levels.map { (code, level) ->
-        Subscription(
-          id = code,
-          name = level.name,
-          badge = Badges.fromServiceBadge(level.badge),
-          prices = level.currencies.filter {
-            PlatformCurrencyUtil
-              .getAvailableCurrencyCodes()
-              .contains(it.key)
-          }.map { (currencyCode, price) ->
-            FiatMoney(price, Currency.getInstance(currencyCode))
-          }.toSet(),
-          level = code.toInt()
-        )
-      }.sortedBy {
-        it.level
-      }
-    }
-
-  fun syncAccountRecord(): Completable {
-    return Completable.fromAction {
-      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-      StorageSyncHelper.scheduleSyncForDataChange()
-    }.subscribeOn(Schedulers.io())
-  }
-}

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

@@ -1,45 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription.boost
-
-import android.animation.Animator
-import android.view.View
-import com.airbnb.lottie.LottieAnimationView
-import com.airbnb.lottie.LottieDrawable
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.animation.AnimationCompleteListener
-import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-
-/**
- * A simple mapping model to show a boost animation.
- */
-object BoostAnimation {
-
-  class Model : PreferenceModel<Model>(isEnabled = true) {
-    override fun areItemsTheSame(newItem: Model): Boolean = true
-  }
-
-  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
-
-    private val lottie: LottieAnimationView = findViewById(R.id.boost_animation_view)
-
-    override fun bind(model: Model) {
-      lottie.playAnimation()
-      lottie.addAnimatorListener(object : AnimationCompleteListener() {
-        override fun onAnimationEnd(animation: Animator?) {
-          lottie.removeAnimatorListener(this)
-          lottie.setMinAndMaxFrame(30, 91)
-          lottie.repeatMode = LottieDrawable.RESTART
-          lottie.repeatCount = LottieDrawable.INFINITE
-          lottie.frame = 30
-          lottie.playAnimation()
-        }
-      })
-    }
-  }
-
-  fun register(adapter: MappingAdapter) {
-    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.boost_animation_pref))
-  }
-}

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

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription.boost
-
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.signal.core.util.money.FiatMoney
-import org.thoughtcrime.securesms.badges.Badges
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.services.DonationsService
-import org.whispersystems.signalservice.internal.ServiceResponse
-import java.math.BigDecimal
-import java.util.Currency
-import java.util.Locale
-
-class BoostRepository(private val donationsService: DonationsService) {
-
-  fun getBoosts(): Single<Map<Currency, List<Boost>>> {
-    return Single.fromCallable { donationsService.boostAmounts }
-      .subscribeOn(Schedulers.io())
-      .flatMap(ServiceResponse<Map<String, List<BigDecimal>>>::flattenResult)
-      .map { result ->
-        result
-          .filter { PlatformCurrencyUtil.getAvailableCurrencyCodes().contains(it.key) }
-          .mapKeys { (code, _) -> Currency.getInstance(code) }
-          .mapValues { (currency, prices) -> prices.map { Boost(FiatMoney(it, currency)) } }
-      }
-  }
-
-  fun getBoostBadge(): Single<Badge> {
-    return Single
-      .fromCallable {
-        ApplicationDependencies.getDonationsService()
-          .getBoostBadge(Locale.getDefault())
-      }
-      .subscribeOn(Schedulers.io())
-      .flatMap(ServiceResponse<SignalServiceProfile.Badge>::flattenResult)
-      .map(Badges::fromServiceBadge)
-  }
-}

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

@@ -40,7 +40,7 @@ class SetCurrencyFragment : DSLSettingsBottomSheetFragment() {
           summary = DSLSettingsText.from(currency.currencyCode),
           onClick = {
             viewModel.setSelectedCurrency(currency.currencyCode)
-            donationPaymentComponent.donationPaymentRepository.scheduleSyncForAccountRecordChange()
+            donationPaymentComponent.stripeRepository.scheduleSyncForAccountRecordChange()
             dismissAllowingStateLoss()
           }
         )

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

@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.content.Intent
+import androidx.fragment.app.Fragment
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.thoughtcrime.securesms.components.FragmentWrapperActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
+
+/**
+ * Activity wrapper for donate to signal screen. An activity is needed because Google Pay uses the
+ * activity [DonateToSignalActivity.startActivityForResult] flow that would be missed by a parent fragment.
+ */
+class DonateToSignalActivity : FragmentWrapperActivity(), DonationPaymentComponent {
+
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
+  override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create()
+
+  override fun getFragment(): Fragment {
+    return DonateToSignalFragment().apply {
+      arguments = DonateToSignalFragmentArgs.Builder(DonateToSignalType.ONE_TIME).build().toBundle()
+    }
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data))
+  }
+}

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
+import android.content.DialogInterface
 import android.text.SpannableStringBuilder
 import android.view.View
 import android.view.ViewGroup
@@ -7,22 +8,17 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import androidx.navigation.navGraphViewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.LottieAnimationView
-import com.google.android.gms.wallet.PaymentData
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
-import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.core.util.dp
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
-import org.signal.donations.GooglePayApi
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.BadgePreview
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
@@ -31,15 +27,8 @@ import org.thoughtcrime.securesms.components.WrapperDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripeAction
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripeActionResult
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
 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
@@ -49,22 +38,22 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.databinding.DonateToSignalFragmentBinding
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.subscription.Subscription
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 import org.thoughtcrime.securesms.util.Projection
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import java.util.Currency
 
 /**
  * Unified donation fragment which allows users to choose between monthly or one-time donations.
  */
-class DonateToSignalFragment : DSLSettingsFragment(
-  layoutId = R.layout.donate_to_signal_fragment
-) {
+class DonateToSignalFragment :
+  DSLSettingsFragment(
+    layoutId = R.layout.donate_to_signal_fragment
+  ),
+  DonationCheckoutDelegate.Callback {
 
   companion object {
     private val TAG = Log.tag(DonateToSignalFragment::class.java)
@@ -89,26 +78,20 @@ class DonateToSignalFragment : DSLSettingsFragment(
     }
   }
 
+  private var errorDialog: DialogInterface? = null
+
   private val args: DonateToSignalFragmentArgs by navArgs()
   private val viewModel: DonateToSignalViewModel by viewModels(factoryProducer = {
     DonateToSignalViewModel.Factory(args.startType)
   })
 
-  private val stripePaymentViewModel: StripePaymentInProgressViewModel by navGraphViewModels(
-    R.id.donate_to_signal,
-    factoryProducer = {
-      donationPaymentComponent = requireListener()
-      StripePaymentInProgressViewModel.Factory(donationPaymentComponent.donationPaymentRepository)
-    }
-  )
-
   private val disposables = LifecycleDisposable()
   private val binding by ViewBinderDelegate(DonateToSignalFragmentBinding::bind)
 
-  private lateinit var donationPaymentComponent: DonationPaymentComponent
+  private var donationCheckoutDelegate: DonationCheckoutDelegate? = null
 
   private val supportTechSummary: CharSequence by lazy {
-    SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__support_technology)))
+    SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__private_messaging)))
       .append(" ")
       .append(
         SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary)) {
@@ -118,7 +101,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
   }
 
   override fun onToolbarNavigationClicked() {
-    findNavController().popBackStack()
+    requireActivity().onBackPressedDispatcher.onBackPressed()
   }
 
   override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
@@ -129,18 +112,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
   }
 
   override fun bindAdapter(adapter: MappingAdapter) {
-    donationPaymentComponent = requireListener()
-    registerGooglePayCallback()
-
-    setFragmentResultListener(GatewaySelectorBottomSheet.REQUEST_KEY) { _, bundle ->
-      val response: GatewayResponse = bundle.getParcelable(GatewaySelectorBottomSheet.REQUEST_KEY)!!
-      handleGatewaySelectionResponse(response)
-    }
-
-    setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
-      val result: StripeActionResult = bundle.getParcelable(StripePaymentInProgressFragment.REQUEST_KEY)!!
-      handleStripeActionResult(result)
-    }
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this)
 
     val recyclerView = this.recyclerView!!
     recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS
@@ -166,13 +138,17 @@ class DonateToSignalFragment : DSLSettingsFragment(
 
     disposables.bindTo(viewLifecycleOwner)
 
-    disposables += DonationError.getErrorsForSource(DonationErrorSource.BOOST).subscribe { error ->
-      showErrorDialog(error)
-    }
+    disposables += DonationError.getErrorsForSource(DonationErrorSource.BOOST)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { error ->
+        showErrorDialog(error)
+      }
 
-    disposables += DonationError.getErrorsForSource(DonationErrorSource.SUBSCRIPTION).subscribe { error ->
-      showErrorDialog(error)
-    }
+    disposables += DonationError.getErrorsForSource(DonationErrorSource.SUBSCRIPTION)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { error ->
+        showErrorDialog(error)
+      }
 
     disposables += viewModel.actions.subscribe { action ->
       when (action) {
@@ -193,7 +169,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
         is DonateToSignalAction.CancelSubscription -> {
           findNavController().safeNavigate(
             DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
-              StripeAction.CANCEL_SUBSCRIPTION,
+              DonationProcessorAction.CANCEL_SUBSCRIPTION,
               action.gatewayRequest
             )
           )
@@ -201,7 +177,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
         is DonateToSignalAction.UpdateSubscription -> {
           findNavController().safeNavigate(
             DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
-              StripeAction.UPDATE_SUBSCRIPTION,
+              DonationProcessorAction.UPDATE_SUBSCRIPTION,
               action.gatewayRequest
             )
           )
@@ -214,20 +190,44 @@ class DonateToSignalFragment : DSLSettingsFragment(
     }
   }
 
+  override fun onStop() {
+    super.onStop()
+
+    listOf(
+      binding.boost1Animation,
+      binding.boost2Animation,
+      binding.boost3Animation,
+      binding.boost4Animation,
+      binding.boost5Animation,
+      binding.boost6Animation
+    ).forEach {
+      it.cancelAnimation()
+    }
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    donationCheckoutDelegate = null
+  }
+
   private fun getConfiguration(state: DonateToSignalState): DSLConfiguration {
     return configure {
       space(36.dp)
 
       customPref(BadgePreview.BadgeModel.SubscriptionModel(state.badge))
 
+      space(12.dp)
+
       noPadTextPref(
         title = DSLSettingsText.from(
-          R.string.DonateToSignalFragment__powered_by,
+          R.string.DonateToSignalFragment__privacy_over_profit,
           DSLSettingsText.CenterModifier,
           DSLSettingsText.TitleLargeModifier
         )
       )
 
+      space(8.dp)
+
       noPadTextPref(
         title = DSLSettingsText.from(supportTechSummary, DSLSettingsText.CenterModifier)
       )
@@ -268,7 +268,7 @@ class DonateToSignalFragment : DSLSettingsFragment(
       if (state.donateToSignalType == DonateToSignalType.MONTHLY && state.monthlyDonationState.isSubscriptionActive) {
         primaryButton(
           text = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
-          isEnabled = state.canContinue,
+          isEnabled = state.canUpdate,
           onClick = {
             MaterialAlertDialogBuilder(requireContext())
               .setTitle(R.string.SubscribeFragment__update_subscription_question)
@@ -387,88 +387,21 @@ class DonateToSignalFragment : DSLSettingsFragment(
     }
   }
 
-  private fun handleGatewaySelectionResponse(gatewayResponse: GatewayResponse) {
-    when (gatewayResponse.gateway) {
-      GatewayResponse.Gateway.GOOGLE_PAY -> launchGooglePay(gatewayResponse)
-      GatewayResponse.Gateway.PAYPAL -> error("PayPal is not currently supported.")
-      GatewayResponse.Gateway.CREDIT_CARD -> launchCreditCard(gatewayResponse)
-    }
-  }
-
-  private fun handleStripeActionResult(result: StripeActionResult) {
-    when (result.status) {
-      StripeActionResult.Status.SUCCESS -> handleSuccessfulStripeActionResult(result)
-      StripeActionResult.Status.FAILURE -> handleFailedStripeActionResult(result)
-    }
-
-    viewModel.refreshActiveSubscription()
-  }
-
-  private fun handleSuccessfulStripeActionResult(result: StripeActionResult) {
-    if (result.action == StripeAction.CANCEL_SUBSCRIPTION) {
-      Snackbar.make(requireView(), R.string.SubscribeFragment__your_subscription_has_been_cancelled, Snackbar.LENGTH_LONG).show()
-    } else {
-      findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToThanksForYourSupportBottomSheetDialog(result.request.badge))
-    }
-  }
-
-  private fun handleFailedStripeActionResult(result: StripeActionResult) {
-    if (result.action == StripeAction.CANCEL_SUBSCRIPTION) {
-      MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.DonationsErrors__failed_to_cancel_subscription)
-        .setMessage(R.string.DonationsErrors__subscription_cancellation_requires_an_internet_connection)
-        .setPositiveButton(android.R.string.ok) { _, _ ->
-          findNavController().popBackStack()
-        }
-        .show()
-    } else {
-      Log.w(TAG, "Stripe action failed: ${result.action}")
-    }
-  }
-
-  private fun launchGooglePay(gatewayResponse: GatewayResponse) {
-    viewModel.provideGatewayRequestForGooglePay(gatewayResponse.request)
-    donationPaymentComponent.donationPaymentRepository.requestTokenFromGooglePay(
-      price = FiatMoney(gatewayResponse.request.price, Currency.getInstance(gatewayResponse.request.currencyCode)),
-      label = gatewayResponse.request.label,
-      requestCode = gatewayResponse.request.donateToSignalType.requestCode.toInt()
-    )
-  }
-
-  private fun launchCreditCard(gatewayResponse: GatewayResponse) {
-    if (FeatureFlags.creditCardPayments()) {
-      findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToCreditCardFragment(gatewayResponse.request))
-    } else {
-      error("Credit cards are not currently enabled.")
-    }
-  }
-
-  private fun registerGooglePayCallback() {
-    donationPaymentComponent.googlePayResultPublisher.subscribeBy(
-      onNext = { paymentResult ->
-        viewModel.consumeGatewayRequestForGooglePay()?.let {
-          donationPaymentComponent.donationPaymentRepository.onActivityResult(
-            paymentResult.requestCode,
-            paymentResult.resultCode,
-            paymentResult.data,
-            paymentResult.requestCode,
-            GooglePayRequestCallback(it)
-          )
-        }
-      }
-    )
-  }
-
   private fun showErrorDialog(throwable: Throwable) {
-    Log.d(TAG, "Displaying donation error dialog.", true)
-    DonationErrorDialogs.show(
-      requireContext(), throwable,
-      object : DonationErrorDialogs.DialogCallback() {
-        override fun onDialogDismissed() {
-          findNavController().popBackStack()
+    if (errorDialog != null) {
+      Log.d(TAG, "Already displaying an error dialog. Skipping.", throwable, true)
+    } else {
+      Log.d(TAG, "Displaying donation error dialog.", true)
+      errorDialog = DonationErrorDialogs.show(
+        requireContext(), throwable,
+        object : DonationErrorDialogs.DialogCallback() {
+          override fun onDialogDismissed() {
+            errorDialog = null
+            findNavController().popBackStack()
+          }
         }
-      }
-    )
+      )
+    }
   }
 
   private fun startAnimationAboveSelectedBoost(view: View) {
@@ -500,29 +433,19 @@ class DonateToSignalFragment : DSLSettingsFragment(
     }
   }
 
-  inner class GooglePayRequestCallback(private val request: GatewayRequest) : GooglePayApi.PaymentRequestCallback {
-    override fun onSuccess(paymentData: PaymentData) {
-      Log.d(TAG, "Successfully retrieved payment data from Google Pay", true)
-      stripePaymentViewModel.providePaymentData(paymentData)
-      findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(StripeAction.PROCESS_NEW_DONATION, request))
-    }
+  override fun navigateToStripePaymentInProgress(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(DonationProcessorAction.PROCESS_NEW_DONATION, gatewayRequest))
+  }
 
-    override fun onError(googlePayException: GooglePayApi.GooglePayException) {
-      Log.w(TAG, "Failed to retrieve payment data from Google Pay", googlePayException, true)
+  override fun navigateToCreditCardForm(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToCreditCardFragment(gatewayRequest))
+  }
 
-      val error = DonationError.getGooglePayRequestTokenError(
-        source = when (request.donateToSignalType) {
-          DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION
-          DonateToSignalType.ONE_TIME -> DonationErrorSource.BOOST
-        },
-        throwable = googlePayException
-      )
+  override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToThanksForYourSupportBottomSheetDialog(gatewayRequest.badge))
+  }
 
-      DonationError.routeDonationError(requireContext(), error)
-    }
-
-    override fun onCancelled() {
-      Log.d(TAG, "Cancelled Google Pay.", true)
-    }
+  override fun onProcessorActionProcessed() {
+    viewModel.refreshActiveSubscription()
   }
 }

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
 import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.subscription.Subscription
@@ -20,42 +21,56 @@ data class DonateToSignalState(
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> oneTimeDonationState.donationStage == DonationStage.READY
       DonateToSignalType.MONTHLY -> monthlyDonationState.donationStage == DonationStage.READY && !monthlyDonationState.transactionState.isInProgress
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val badge: Badge?
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> oneTimeDonationState.badge
       DonateToSignalType.MONTHLY -> monthlyDonationState.selectedSubscription?.badge
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val canSetCurrency: Boolean
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> areFieldsEnabled
       DonateToSignalType.MONTHLY -> areFieldsEnabled && !monthlyDonationState.isSubscriptionActive
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val selectedCurrency: Currency
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> oneTimeDonationState.selectedCurrency
       DonateToSignalType.MONTHLY -> monthlyDonationState.selectedCurrency
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val selectableCurrencyCodes: List<String>
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> oneTimeDonationState.selectableCurrencyCodes
       DonateToSignalType.MONTHLY -> monthlyDonationState.selectableCurrencyCodes
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val level: Int
     get() = when (donateToSignalType) {
       DonateToSignalType.ONE_TIME -> 1
       DonateToSignalType.MONTHLY -> monthlyDonationState.selectedSubscription!!.level
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   val canContinue: Boolean
     get() = when (donateToSignalType) {
-      DonateToSignalType.ONE_TIME -> areFieldsEnabled && oneTimeDonationState.isSelectionValid
+      DonateToSignalType.ONE_TIME -> areFieldsEnabled && oneTimeDonationState.isSelectionValid && InAppDonations.hasAtLeastOnePaymentMethodAvailable()
+      DonateToSignalType.MONTHLY -> areFieldsEnabled && monthlyDonationState.isSelectionValid && InAppDonations.hasAtLeastOnePaymentMethodAvailable()
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
+    }
+
+  val canUpdate: Boolean
+    get() = when (donateToSignalType) {
+      DonateToSignalType.ONE_TIME -> false
       DonateToSignalType.MONTHLY -> areFieldsEnabled && monthlyDonationState.isSelectionValid
+      DonateToSignalType.GIFT -> error("This flow does not support gifts")
     }
 
   data class OneTimeDonationState(

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

@@ -6,5 +6,6 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 enum class DonateToSignalType(val requestCode: Short) : Parcelable {
   ONE_TIME(16141),
-  MONTHLY(16142);
+  MONTHLY(16142),
+  GIFT(16143)
 }

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

@@ -12,24 +12,23 @@ import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.StringUtil
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.OneTimeDonationRepository
 import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
-import org.thoughtcrime.securesms.components.settings.app.subscription.boost.BoostRepository
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
 import org.thoughtcrime.securesms.components.settings.app.subscription.manage.SubscriptionRedemptionJobWatcher
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.subscription.LevelUpdate
 import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.subscription.Subscription
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
 import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
-import org.thoughtcrime.securesms.util.next
 import org.thoughtcrime.securesms.util.rx.RxStore
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import org.whispersystems.signalservice.api.util.Preconditions
 import java.math.BigDecimal
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
@@ -42,8 +41,8 @@ import java.util.Currency
  */
 class DonateToSignalViewModel(
   startType: DonateToSignalType,
-  private val subscriptionsRepository: SubscriptionsRepository,
-  private val boostRepository: BoostRepository
+  private val subscriptionsRepository: MonthlyDonationRepository,
+  private val oneTimeDonationRepository: OneTimeDonationRepository
 ) : ViewModel() {
 
   companion object {
@@ -57,13 +56,11 @@ class DonateToSignalViewModel(
   private val _actions = PublishSubject.create<DonateToSignalAction>()
   private val _activeSubscription = PublishSubject.create<ActiveSubscription>()
 
-  private var gatewayRequest: GatewayRequest? = null
-
   val state = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
   val actions: Observable<DonateToSignalAction> = _actions.observeOn(AndroidSchedulers.mainThread())
 
   init {
-    initializeOneTimeDonationState(boostRepository)
+    initializeOneTimeDonationState(oneTimeDonationRepository)
     initializeMonthlyDonationState(subscriptionsRepository)
 
     networkDisposable += InternetConnectionObserver
@@ -87,7 +84,7 @@ class DonateToSignalViewModel(
   fun retryOneTimeDonationState() {
     if (!oneTimeDonationDisposables.isDisposed && store.state.oneTimeDonationState.donationStage == DonateToSignalState.DonationStage.FAILURE) {
       store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(donationStage = DonateToSignalState.DonationStage.INIT)) }
-      initializeOneTimeDonationState(boostRepository)
+      initializeOneTimeDonationState(oneTimeDonationRepository)
     }
   }
 
@@ -120,7 +117,15 @@ class DonateToSignalViewModel(
   }
 
   fun toggleDonationType() {
-    store.update { it.copy(donateToSignalType = it.donateToSignalType.next()) }
+    store.update {
+      it.copy(
+        donateToSignalType = when (it.donateToSignalType) {
+          DonateToSignalType.ONE_TIME -> DonateToSignalType.MONTHLY
+          DonateToSignalType.MONTHLY -> DonateToSignalType.ONE_TIME
+          DonateToSignalType.GIFT -> error("We are in an illegal state")
+        }
+      )
+    }
   }
 
   fun setSelectedSubscription(subscription: Subscription) {
@@ -178,7 +183,8 @@ class DonateToSignalViewModel(
       label = snapshot.badge!!.description,
       price = amount.amount,
       currencyCode = amount.currency.currencyCode,
-      level = snapshot.level.toLong()
+      level = snapshot.level.toLong(),
+      recipientId = Recipient.self().id
     )
   }
 
@@ -186,6 +192,7 @@ class DonateToSignalViewModel(
     return when (snapshot.donateToSignalType) {
       DonateToSignalType.ONE_TIME -> getOneTimeAmount(snapshot.oneTimeDonationState)
       DonateToSignalType.MONTHLY -> getSelectedSubscriptionCost()
+      DonateToSignalType.GIFT -> error("This ViewModel does not support gifts.")
     }
   }
 
@@ -197,8 +204,8 @@ class DonateToSignalViewModel(
     }
   }
 
-  private fun initializeOneTimeDonationState(boostRepository: BoostRepository) {
-    oneTimeDonationDisposables += boostRepository.getBoostBadge().subscribeBy(
+  private fun initializeOneTimeDonationState(oneTimeDonationRepository: OneTimeDonationRepository) {
+    oneTimeDonationDisposables += oneTimeDonationRepository.getBoostBadge().subscribeBy(
       onSuccess = { badge ->
         store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(badge = badge)) }
       },
@@ -207,7 +214,7 @@ class DonateToSignalViewModel(
       }
     )
 
-    val boosts: Observable<Map<Currency, List<Boost>>> = boostRepository.getBoosts().toObservable()
+    val boosts: Observable<Map<Currency, List<Boost>>> = oneTimeDonationRepository.getBoosts().toObservable()
     val oneTimeCurrency: Observable<Currency> = SignalStore.donationsValues().observableOneTimeCurrency
 
     oneTimeDonationDisposables += Observable.combineLatest(boosts, oneTimeCurrency) { boostMap, currency ->
@@ -243,7 +250,7 @@ class DonateToSignalViewModel(
     )
   }
 
-  private fun initializeMonthlyDonationState(subscriptionsRepository: SubscriptionsRepository) {
+  private fun initializeMonthlyDonationState(subscriptionsRepository: MonthlyDonationRepository) {
     monitorLevelUpdateProcessing()
 
     val allSubscriptions = subscriptionsRepository.getSubscriptions()
@@ -348,25 +355,13 @@ class DonateToSignalViewModel(
     store.dispose()
   }
 
-  fun provideGatewayRequestForGooglePay(request: GatewayRequest) {
-    Log.d(TAG, "Provided with a gateway request.")
-    Preconditions.checkState(gatewayRequest == null)
-    gatewayRequest = request
-  }
-
-  fun consumeGatewayRequestForGooglePay(): GatewayRequest? {
-    val request = gatewayRequest
-    gatewayRequest = null
-    return request
-  }
-
   class Factory(
     private val startType: DonateToSignalType,
-    private val subscriptionsRepository: SubscriptionsRepository = SubscriptionsRepository(ApplicationDependencies.getDonationsService()),
-    private val boostRepository: BoostRepository = BoostRepository(ApplicationDependencies.getDonationsService())
+    private val subscriptionsRepository: MonthlyDonationRepository = MonthlyDonationRepository(ApplicationDependencies.getDonationsService()),
+    private val oneTimeDonationRepository: OneTimeDonationRepository = OneTimeDonationRepository(ApplicationDependencies.getDonationsService())
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return modelClass.cast(DonateToSignalViewModel(startType, subscriptionsRepository, boostRepository)) as T
+      return modelClass.cast(DonateToSignalViewModel(startType, subscriptionsRepository, oneTimeDonationRepository)) as T
     }
   }
 }

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

@@ -0,0 +1,193 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.navGraphViewModels
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.GooglePayApi
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.CreditCardFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.CreditCardResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.util.LifecycleDisposable
+import org.thoughtcrime.securesms.util.fragments.requireListener
+import java.util.Currency
+
+/**
+ * Abstracts out some common UI-level interactions between gift flow and normal donate flow.
+ */
+class DonationCheckoutDelegate(
+  private val fragment: Fragment,
+  private val callback: Callback
+) : DefaultLifecycleObserver {
+
+  companion object {
+    private val TAG = Log.tag(DonationCheckoutDelegate::class.java)
+  }
+
+  private lateinit var donationPaymentComponent: DonationPaymentComponent
+  private val disposables = LifecycleDisposable()
+  private val viewModel: DonationCheckoutViewModel by fragment.viewModels()
+
+  private val stripePaymentViewModel: StripePaymentInProgressViewModel by fragment.navGraphViewModels(
+    R.id.donate_to_signal,
+    factoryProducer = {
+      donationPaymentComponent = fragment.requireListener()
+      StripePaymentInProgressViewModel.Factory(donationPaymentComponent.stripeRepository)
+    }
+  )
+
+  init {
+    fragment.viewLifecycleOwner.lifecycle.addObserver(this)
+  }
+
+  override fun onCreate(owner: LifecycleOwner) {
+    disposables.bindTo(fragment.viewLifecycleOwner)
+    donationPaymentComponent = fragment.requireListener()
+    registerGooglePayCallback()
+
+    fragment.setFragmentResultListener(GatewaySelectorBottomSheet.REQUEST_KEY) { _, bundle ->
+      val response: GatewayResponse = bundle.getParcelable(GatewaySelectorBottomSheet.REQUEST_KEY)!!
+      handleGatewaySelectionResponse(response)
+    }
+
+    fragment.setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: DonationProcessorActionResult = bundle.getParcelable(StripePaymentInProgressFragment.REQUEST_KEY)!!
+      handleDonationProcessorActionResult(result)
+    }
+
+    fragment.setFragmentResultListener(CreditCardFragment.REQUEST_KEY) { _, bundle ->
+      val result: CreditCardResult = bundle.getParcelable(CreditCardFragment.REQUEST_KEY)!!
+      handleCreditCardResult(result)
+    }
+  }
+
+  private fun handleGatewaySelectionResponse(gatewayResponse: GatewayResponse) {
+    when (gatewayResponse.gateway) {
+      GatewayResponse.Gateway.GOOGLE_PAY -> launchGooglePay(gatewayResponse)
+      GatewayResponse.Gateway.PAYPAL -> error("PayPal is not currently supported.")
+      GatewayResponse.Gateway.CREDIT_CARD -> launchCreditCard(gatewayResponse)
+    }
+  }
+
+  private fun handleCreditCardResult(creditCardResult: CreditCardResult) {
+    Log.d(TAG, "Received credit card information from fragment.")
+    stripePaymentViewModel.provideCardData(creditCardResult.creditCardData)
+    callback.navigateToStripePaymentInProgress(creditCardResult.gatewayRequest)
+  }
+
+  private fun handleDonationProcessorActionResult(result: DonationProcessorActionResult) {
+    when (result.status) {
+      DonationProcessorActionResult.Status.SUCCESS -> handleSuccessfulDonationProcessorActionResult(result)
+      DonationProcessorActionResult.Status.FAILURE -> handleFailedDonationProcessorActionResult(result)
+    }
+
+    callback.onProcessorActionProcessed()
+  }
+
+  private fun handleSuccessfulDonationProcessorActionResult(result: DonationProcessorActionResult) {
+    if (result.action == DonationProcessorAction.CANCEL_SUBSCRIPTION) {
+      Snackbar.make(fragment.requireView(), R.string.SubscribeFragment__your_subscription_has_been_cancelled, Snackbar.LENGTH_LONG).show()
+    } else {
+      callback.onPaymentComplete(result.request)
+    }
+  }
+
+  private fun handleFailedDonationProcessorActionResult(result: DonationProcessorActionResult) {
+    if (result.action == DonationProcessorAction.CANCEL_SUBSCRIPTION) {
+      MaterialAlertDialogBuilder(fragment.requireContext())
+        .setTitle(R.string.DonationsErrors__failed_to_cancel_subscription)
+        .setMessage(R.string.DonationsErrors__subscription_cancellation_requires_an_internet_connection)
+        .setPositiveButton(android.R.string.ok) { _, _ ->
+          fragment.findNavController().popBackStack()
+        }
+        .show()
+    } else {
+      Log.w(TAG, "Stripe action failed: ${result.action}")
+    }
+  }
+
+  private fun launchGooglePay(gatewayResponse: GatewayResponse) {
+    viewModel.provideGatewayRequestForGooglePay(gatewayResponse.request)
+    donationPaymentComponent.stripeRepository.requestTokenFromGooglePay(
+      price = FiatMoney(gatewayResponse.request.price, Currency.getInstance(gatewayResponse.request.currencyCode)),
+      label = gatewayResponse.request.label,
+      requestCode = gatewayResponse.request.donateToSignalType.requestCode.toInt()
+    )
+  }
+
+  private fun launchCreditCard(gatewayResponse: GatewayResponse) {
+    if (InAppDonations.isCreditCardAvailable()) {
+      callback.navigateToCreditCardForm(gatewayResponse.request)
+    } else {
+      error("Credit cards are not currently enabled.")
+    }
+  }
+
+  private fun registerGooglePayCallback() {
+    disposables += donationPaymentComponent.googlePayResultPublisher.subscribeBy(
+      onNext = { paymentResult ->
+        viewModel.consumeGatewayRequestForGooglePay()?.let {
+          donationPaymentComponent.stripeRepository.onActivityResult(
+            paymentResult.requestCode,
+            paymentResult.resultCode,
+            paymentResult.data,
+            paymentResult.requestCode,
+            GooglePayRequestCallback(it)
+          )
+        }
+      }
+    )
+  }
+
+  inner class GooglePayRequestCallback(private val request: GatewayRequest) : GooglePayApi.PaymentRequestCallback {
+    override fun onSuccess(paymentData: PaymentData) {
+      Log.d(TAG, "Successfully retrieved payment data from Google Pay", true)
+      stripePaymentViewModel.providePaymentData(paymentData)
+      callback.navigateToStripePaymentInProgress(request)
+    }
+
+    override fun onError(googlePayException: GooglePayApi.GooglePayException) {
+      Log.w(TAG, "Failed to retrieve payment data from Google Pay", googlePayException, true)
+
+      val error = DonationError.getGooglePayRequestTokenError(
+        source = when (request.donateToSignalType) {
+          DonateToSignalType.MONTHLY -> DonationErrorSource.SUBSCRIPTION
+          DonateToSignalType.ONE_TIME -> DonationErrorSource.BOOST
+          DonateToSignalType.GIFT -> DonationErrorSource.GIFT
+        },
+        throwable = googlePayException
+      )
+
+      DonationError.routeDonationError(fragment.requireContext(), error)
+    }
+
+    override fun onCancelled() {
+      Log.d(TAG, "Cancelled Google Pay.", true)
+    }
+  }
+
+  interface Callback {
+    fun navigateToStripePaymentInProgress(gatewayRequest: GatewayRequest)
+    fun navigateToCreditCardForm(gatewayRequest: GatewayRequest)
+    fun onPaymentComplete(gatewayRequest: GatewayRequest)
+    fun onProcessorActionProcessed()
+  }
+}

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

@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.lifecycle.ViewModel
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
+import org.whispersystems.signalservice.api.util.Preconditions
+
+/**
+ * State holder for the checkout flow when utilizing Google Pay.
+ */
+class DonationCheckoutViewModel : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(DonationCheckoutViewModel::class.java)
+  }
+
+  private var gatewayRequest: GatewayRequest? = null
+
+  fun provideGatewayRequestForGooglePay(request: GatewayRequest) {
+    Log.d(TAG, "Provided with a gateway request.")
+    Preconditions.checkState(gatewayRequest == null)
+    gatewayRequest = request
+  }
+
+  fun consumeGatewayRequestForGooglePay(): GatewayRequest? {
+    val request = gatewayRequest
+    gatewayRequest = null
+    return request
+  }
+}

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

@@ -35,6 +35,9 @@ object DonationPillToggle {
         DonateToSignalType.MONTHLY -> {
           presentButtons(model, binding.monthly, binding.oneTime)
         }
+        DonateToSignalType.GIFT -> {
+          error("Unsupported donation type.")
+        }
       }
     }
 

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

@@ -1,10 +1,10 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-enum class StripeAction : Parcelable {
+enum class DonationProcessorAction : Parcelable {
   PROCESS_NEW_DONATION,
   UPDATE_SUBSCRIPTION,
   CANCEL_SUBSCRIPTION

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

@@ -1,12 +1,12 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
 
 @Parcelize
-class StripeActionResult(
-  val action: StripeAction,
+class DonationProcessorActionResult(
+  val action: DonationProcessorAction,
   val request: GatewayRequest,
   val status: Status
 ) : Parcelable {

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

@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+enum class DonationProcessorStage {
+  INIT,
+  PAYMENT_PIPELINE,
+  CANCELLING,
+  FAILED,
+  COMPLETE;
+
+  val isInProgress: Boolean get() = this == PAYMENT_PIPELINE || this == CANCELLING
+  val isTerminal: Boolean get() = this == FAILED || this == COMPLETE
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcher.kt

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.text.Editable
+import android.text.TextWatcher
+
+class CreditCardExpirationTextWatcher : TextWatcher {
+
+  private var isBackspace = false
+
+  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    isBackspace = count == 0
+  }
+
+  override fun afterTextChanged(s: Editable) {
+    val text = s.toString()
+    val formattedText = when (text.length) {
+      1 -> formatForSingleCharacter(text)
+      2 -> formatForTwoCharacters(text)
+      else -> text
+    }
+
+    val finalText = if (isBackspace && text.length < formattedText.length && formattedText.endsWith("/")) {
+      formattedText.dropLast(2)
+    } else {
+      formattedText
+    }
+
+    if (finalText != text) {
+      s.replace(0, s.length, finalText)
+    }
+  }
+
+  private fun formatForSingleCharacter(text: String): String {
+    val number = text.toIntOrNull() ?: return text
+    return if (number > 1) {
+      "0$number/"
+    } else {
+      text
+    }
+  }
+
+  private fun formatForTwoCharacters(text: String): String {
+    val number = text.toIntOrNull() ?: return text
+    return if (number <= 12) {
+      "%02d/".format(number)
+    } else {
+      text
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFormState.kt

@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
 
+import org.signal.donations.StripeApi
+
 data class CreditCardFormState(
   val focusedField: FocusedField = FocusedField.NONE,
   val number: String = "",
@@ -12,4 +14,13 @@ data class CreditCardFormState(
     EXPIRATION,
     CODE
   }
+
+  fun toCardData(): StripeApi.CardData {
+    return StripeApi.CardData(
+      number,
+      expiration.month.toInt(),
+      expiration.year.toInt(),
+      code.toInt()
+    )
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt

@@ -3,16 +3,27 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate.c
 import android.content.Context
 import android.os.Bundle
 import android.view.View
+import android.view.WindowManager
+import android.view.inputmethod.EditorInfo
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager.LayoutParams
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
 import org.thoughtcrime.securesms.databinding.CreditCardFragmentBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.LifecycleDisposable
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
 
@@ -22,10 +33,27 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
   private val lifecycleDisposable = LifecycleDisposable()
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    binding.title.text = if (args.request.donateToSignalType == DonateToSignalType.MONTHLY) {
+      getString(
+        R.string.CreditCardFragment__donation_amount_s_per_month,
+        FiatMoneyUtil.format(resources, args.request.fiat, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+      )
+    } else {
+      getString(R.string.CreditCardFragment__donation_amount_s, FiatMoneyUtil.format(resources, args.request.fiat))
+    }
+
+    binding.description.setLinkColor(ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary))
+    binding.description.setLearnMoreVisible(true)
+    binding.description.setOnLinkClickListener {
+      findNavController().safeNavigate(CreditCardFragmentDirections.actionCreditCardFragmentToYourInformationIsPrivateBottomSheet())
+    }
+
     binding.cardNumber.addTextChangedListener(afterTextChanged = {
-      viewModel.onNumberChanged(it?.toString() ?: "")
+      viewModel.onNumberChanged(it?.toString()?.filter { it != ' ' } ?: "")
     })
 
+    binding.cardNumber.addTextChangedListener(CreditCardTextWatcher())
+
     binding.cardNumber.setOnFocusChangeListener { v, hasFocus ->
       viewModel.onNumberFocusChanged(hasFocus)
     }
@@ -38,24 +66,59 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
       viewModel.onCodeFocusChanged(hasFocus)
     }
 
+    binding.cardCvv.setOnEditorActionListener { _, actionId, _ ->
+      if (actionId == EditorInfo.IME_ACTION_DONE) {
+        binding.continueButton.performClick()
+        true
+      } else {
+        false
+      }
+    }
+
     binding.cardExpiry.addTextChangedListener(afterTextChanged = {
       viewModel.onExpirationChanged(it?.toString() ?: "")
     })
 
+    binding.cardExpiry.addTextChangedListener(CreditCardExpirationTextWatcher())
+
     binding.cardExpiry.setOnFocusChangeListener { v, hasFocus ->
       viewModel.onExpirationFocusChanged(hasFocus)
     }
 
+    binding.continueButton.setOnClickListener {
+      findNavController().popBackStack()
+
+      val resultBundle = bundleOf(
+        REQUEST_KEY to CreditCardResult(
+          args.request,
+          viewModel.getCardData()
+        )
+      )
+
+      setFragmentResult(REQUEST_KEY, resultBundle)
+    }
+
+    binding.toolbar.setNavigationOnClickListener {
+      findNavController().popBackStack()
+    }
+
     lifecycleDisposable.bindTo(viewLifecycleOwner)
     lifecycleDisposable += viewModel.state.subscribe {
       // TODO [alex] -- type
-      // TODO [alex] -- all fields valid
+      presentContinue(it)
       presentCardNumberWrapper(it.numberValidity)
       presentCardExpiryWrapper(it.expirationValidity)
       presentCardCodeWrapper(it.codeValidity)
     }
   }
 
+  override fun onStart() {
+    super.onStart()
+    if (!TextSecurePreferences.isScreenSecurityEnabled(requireContext())) {
+      requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }
+  }
+
   override fun onResume() {
     super.onResume()
 
@@ -67,6 +130,17 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
     }
   }
 
+  override fun onStop() {
+    super.onStop()
+    if (!TextSecurePreferences.isScreenSecurityEnabled(requireContext())) {
+      requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }
+  }
+
+  private fun presentContinue(state: CreditCardValidationState) {
+    binding.continueButton.isEnabled = state.isValid
+  }
+
   private fun presentCardNumberWrapper(validity: CreditCardNumberValidator.Validity) {
     val errorState = when (validity) {
       CreditCardNumberValidator.Validity.INVALID -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_card_number)
@@ -84,7 +158,13 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
       CreditCardExpirationValidator.Validity.INVALID_MONTH -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_month)
       CreditCardExpirationValidator.Validity.INVALID_YEAR -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_year)
       CreditCardExpirationValidator.Validity.POTENTIALLY_VALID -> NO_ERROR
-      CreditCardExpirationValidator.Validity.FULLY_VALID -> NO_ERROR
+      CreditCardExpirationValidator.Validity.FULLY_VALID -> {
+        if (binding.cardExpiry.isFocused) {
+          binding.cardCvv.requestFocus()
+        }
+
+        NO_ERROR
+      }
     }
 
     binding.cardExpiryWrapper.error = errorState.resolveErrorText(requireContext())
@@ -116,6 +196,8 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
   }
 
   companion object {
+    val REQUEST_KEY = "card.data"
+
     private val NO_ERROR = ErrorState(false, -1)
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardResult.kt

@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
+
+/**
+ * Encapsulates data returned from the credit card form that can be used
+ * for a credit card based donation payment.
+ */
+@Parcelize
+data class CreditCardResult(
+  val gatewayRequest: GatewayRequest,
+  val creditCardData: StripeApi.CardData
+) : Parcelable

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcher.kt

@@ -0,0 +1,75 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.text.Editable
+import android.text.TextWatcher
+
+/**
+ * Formats a credit card by type as the user modifies it.
+ */
+class CreditCardTextWatcher : TextWatcher {
+
+  private var isBackspace: Boolean = false
+
+  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    isBackspace = count == 0
+  }
+
+  override fun afterTextChanged(s: Editable) {
+    val userInput = s.toString()
+    val normalizedNumber = userInput.filter { it != ' ' }
+
+    val formattedNumber = when (CreditCardType.fromCardNumber(normalizedNumber)) {
+      CreditCardType.AMERICAN_EXPRESS -> applyAmexFormatting(normalizedNumber)
+      CreditCardType.UNIONPAY -> applyUnionPayFormatting(normalizedNumber)
+      CreditCardType.OTHER -> applyOtherFormatting(normalizedNumber)
+    }
+
+    val backspaceHandled = if (isBackspace && formattedNumber.endsWith(' ') && formattedNumber.length > userInput.length) {
+      formattedNumber.dropLast(2)
+    } else {
+      formattedNumber
+    }
+
+    if (userInput != backspaceHandled) {
+      s.replace(0, s.length, backspaceHandled)
+    }
+  }
+
+  private fun applyAmexFormatting(normalizedNumber: String): String {
+    return applyGrouping(normalizedNumber, listOf(4, 6, 5))
+  }
+
+  private fun applyUnionPayFormatting(normalizedNumber: String): String {
+    return when {
+      normalizedNumber.length <= 13 -> applyGrouping(normalizedNumber, listOf(4, 4, 5))
+      normalizedNumber.length <= 16 -> applyGrouping(normalizedNumber, listOf(4, 4, 4, 4))
+      else -> applyGrouping(normalizedNumber, listOf(5, 5, 5, 4))
+    }
+  }
+
+  private fun applyOtherFormatting(normalizedNumber: String): String {
+    return if (normalizedNumber.length <= 16) {
+      applyGrouping(normalizedNumber, listOf(4, 4, 4, 4))
+    } else {
+      applyGrouping(normalizedNumber, listOf(5, 5, 5, 4))
+    }
+  }
+
+  private fun applyGrouping(normalizedNumber: String, groups: List<Int>): String {
+    val maxCardLength = groups.sum()
+
+    return groups.fold(0 to emptyList<String>()) { acc, limit ->
+      val offset = acc.first
+      val section = normalizedNumber.drop(offset).take(limit)
+      val segment = if (limit == section.length && offset + limit != maxCardLength) {
+        "$section "
+      } else {
+        section
+      }
+
+      (offset + limit) to acc.second + segment
+    }.second.filter { it.isNotEmpty() }.joinToString("")
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardValidationState.kt

@@ -5,4 +5,9 @@ data class CreditCardValidationState(
   val numberValidity: CreditCardNumberValidator.Validity,
   val expirationValidity: CreditCardExpirationValidator.Validity,
   val codeValidity: CreditCardCodeValidator.Validity
-)
+) {
+  val isValid: Boolean =
+    numberValidity == CreditCardNumberValidator.Validity.FULLY_VALID &&
+      expirationValidity == CreditCardExpirationValidator.Validity.FULLY_VALID &&
+      codeValidity == CreditCardCodeValidator.Validity.FULLY_VALID
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardViewModel.kt

@@ -6,6 +6,7 @@ import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.processors.BehaviorProcessor
+import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.util.rx.RxStore
 import java.util.Calendar
 
@@ -76,6 +77,10 @@ class CreditCardViewModel : ViewModel() {
     updateFocus(CreditCardFormState.FocusedField.CODE, isFocused)
   }
 
+  fun getCardData(): StripeApi.CardData {
+    return formStore.state.toCardData()
+  }
+
   private fun updateFocus(
     newFocusedField: CreditCardFormState.FocusedField,
     isFocused: Boolean

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt

@@ -0,0 +1,72 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import org.signal.core.util.dp
+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
+
+/**
+ * Displays information about how Signal keeps card details private and how
+ * Signal does not link donation information to your Signal account.
+ */
+class YourInformationIsPrivateBottomSheet : DSLSettingsBottomSheetFragment() {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    adapter.submitList(getConfiguration().toMappingModelList())
+  }
+
+  private fun getConfiguration(): DSLConfiguration {
+    return configure {
+
+      space(10.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__your_information_is_private,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_HeadlineMedium)
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__signal_does_not_collect,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__we_use_stripe,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__signal_does_not_and_cannot,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__thank_you,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(56.dp)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewayRequest.kt

@@ -1,10 +1,12 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
 
 import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
+import org.thoughtcrime.securesms.recipients.RecipientId
 import java.math.BigDecimal
 import java.util.Currency
 
@@ -15,7 +17,10 @@ data class GatewayRequest(
   val label: String,
   val price: BigDecimal,
   val currencyCode: String,
-  val level: Long
+  val level: Long,
+  val recipientId: RecipientId,
+  val additionalMessage: String? = null
 ) : Parcelable {
+  @IgnoredOnParcel
   val fiat: FiatMoney = FiatMoney(price, Currency.getInstance(currencyCode))
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt

@@ -12,8 +12,11 @@ import org.thoughtcrime.securesms.badges.models.BadgeDisplay112
 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.DSLSettingsIcon
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.NO_TINT
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
 import org.thoughtcrime.securesms.components.settings.configure
@@ -31,7 +34,7 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
   private val args: GatewaySelectorBottomSheetArgs by navArgs()
 
   private val viewModel: GatewaySelectorViewModel by viewModels(factoryProducer = {
-    GatewaySelectorViewModel.Factory(args, requireListener<DonationPaymentComponent>().donationPaymentRepository)
+    GatewaySelectorViewModel.Factory(args, requireListener<DonationPaymentComponent>().stripeRepository)
   })
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
@@ -59,9 +62,10 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
       when (args.request.donateToSignalType) {
         DonateToSignalType.MONTHLY -> presentMonthlyText()
         DonateToSignalType.ONE_TIME -> presentOneTimeText()
+        DonateToSignalType.GIFT -> presentGiftText()
       }
 
-      space(68.dp)
+      space(66.dp)
 
       if (state.isGooglePayAvailable) {
         customPref(
@@ -79,11 +83,12 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
       // PayPal
 
       // Credit Card
-      if (state.isCreditCardAvailable) {
+      if (InAppDonations.isCreditCardAvailable()) {
         space(12.dp)
 
         primaryButton(
           text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__credit_or_debit_card),
+          icon = DSLSettingsIcon.from(R.drawable.credit_card, NO_TINT),
           onClick = {
             findNavController().popBackStack()
             val response = GatewayResponse(GatewayResponse.Gateway.CREDIT_CARD, args.request)
@@ -126,7 +131,26 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
     space(6.dp)
     noPadTextPref(
       title = DSLSettingsText.from(
-        getString(R.string.GatewaySelectorBottomSheet__get_a_s_badge_for_d_days, args.request.badge.name, 30),
+        resources.getQuantityString(R.plurals.GatewaySelectorBottomSheet__get_a_s_badge_for_d_days, 30, args.request.badge.name, 30),
+        DSLSettingsText.CenterModifier,
+        DSLSettingsText.BodyLargeModifier,
+        DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant))
+      )
+    )
+  }
+
+  private fun DSLConfiguration.presentGiftText() {
+    noPadTextPref(
+      title = DSLSettingsText.from(
+        getString(R.string.GatewaySelectorBottomSheet__donate_s_to_signal, FiatMoneyUtil.format(resources, args.request.fiat)),
+        DSLSettingsText.CenterModifier,
+        DSLSettingsText.TitleLargeModifier
+      )
+    )
+    space(6.dp)
+    noPadTextPref(
+      title = DSLSettingsText.from(
+        R.string.GatewaySelectorBottomSheet__send_a_gift_badge,
         DSLSettingsText.CenterModifier,
         DSLSettingsText.BodyLargeModifier,
         DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant))