Bump version to 6.32.5

This seems to be a SQLite/SQLCipher caching issue.

Fixes #13172

.github/workflows/android.yml

@@ -18,8 +18,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-          submodules: true
 
     - name: set up JDK 17
       uses: actions/setup-java@v3

.github/workflows/diffuse.yml

@@ -15,7 +15,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        submodules: true
         ref: ${{ github.event.pull_request.base.sha }}
 
     - name: set up JDK 17
@@ -46,7 +45,6 @@ jobs:
 
     - uses: actions/checkout@v3
       with:
-        submodules: true
         clean: 'false'
 
     - name: Build with Gradle

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "libwebp"]
-	path = libwebp
-	url = https://github.com/webmproject/libwebp.git

CONTRIBUTING.md

@@ -15,12 +15,6 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.
 
 
-## Building
-
-1. You'll need to get the `libwebp` submodule after checking out the repository with `git submodule init && git submodule update`
-1. Most things are pretty straightforward, and opening the project in Android Studio should get you most of the way there.
-1. Depending on your configuration, you'll also likely need to install additional SDK Tool components, namely the versions of NDK and CMake we are currently using in our [Docker](https://github.com/signalapp/Signal-Android/blob/main/reproducible-builds/Dockerfile#L30) configuration.
-
 ## Issues
 
 ### Useful bug reports

app/build.gradle

@@ -3,6 +3,7 @@ import com.android.build.api.dsl.ManagedVirtualDevice
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'com.google.protobuf'
     id 'androidx.navigation.safeargs'
     id 'org.jlleitschuh.gradle.ktlint'
     id 'org.jetbrains.kotlin.android'
@@ -10,11 +11,25 @@ plugins {
     id 'kotlin-parcelize'
     id 'com.squareup.wire'
     id 'translations'
-    id 'licenses'
 }
 
 apply from: 'static-ips.gradle'
 
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.18.0'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
 wire {
     kotlin {
         javaInterop = true
@@ -33,15 +48,15 @@ ktlint {
     version = "0.49.1"
 }
 
-def canonicalVersionCode = 1347
-def canonicalVersionName = "6.36.5"
+def canonicalVersionCode = 1327
+def canonicalVersionName = "6.32.5"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
@@ -520,11 +535,13 @@ dependencies {
     implementation project(':sms-exporter')
     implementation project(':sticky-header-grid')
     implementation project(':photoview')
-    implementation project(':glide-webp')
 
     implementation libs.libsignal.android
+    implementation libs.google.protobuf.javalite
 
-    implementation libs.mobilecoin
+    implementation(libs.mobilecoin) {
+        exclude group: 'com.google.protobuf'
+    }
 
     implementation libs.signal.ringrtc
 

app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt

@@ -26,13 +26,15 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
   }
 
   override fun initializeLogging() {
-    Log.initialize({ true }, AndroidLogger(), PersistentLogger(this), inMemoryLogger)
+    persistentLogger = PersistentLogger(this)
+
+    Log.initialize({ true }, AndroidLogger(), persistentLogger, inMemoryLogger)
 
     SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
 
     SignalExecutors.UNBOUNDED.execute {
       Log.blockUntilAllWritesFinished()
-      LogDatabase.getInstance(this).logs.trimToSize()
+      LogDatabase.getInstance(this).trimToSize()
     }
   }
 }

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

@@ -144,7 +144,6 @@ class ConversationItemPreviewer {
       1024,
       Optional.empty(),
       Optional.empty(),
-      0,
       Optional.of("/not-there.jpg"),
       false,
       false,

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt

@@ -47,6 +47,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(),
       isGroupThread = false,
       adapterPosition = 5
@@ -68,6 +69,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.END
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -89,6 +91,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.START
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(prev),
       isGroupThread = false,
       adapterPosition = 5
@@ -112,6 +115,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.MIDDLE
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -133,6 +137,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -154,6 +159,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(prev),
       isGroupThread = false,
       adapterPosition = 5
@@ -177,6 +183,7 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
+      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -203,7 +210,7 @@ class V2ConversationItemShapeTest {
 
     private val colorizer = Colorizer()
 
-    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.Standard
+    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.STANDARD
 
     override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
     override val selectedItems: Set<MultiselectPart> = emptySet()

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

@@ -293,22 +293,22 @@ class GroupTableTest {
 
   private fun insertPushGroup(
     members: List<DecryptedMember> = listOf(
-      DecryptedMember.Builder()
-        .aciBytes(harness.self.requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setAciBytes(harness.self.requireAci().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
         .build(),
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setAciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
         .build()
     )
   ): GroupId {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(members)
-      .revision(0)
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members)
+      .setRevision(0)
       .build()
 
     return groupTable.create(groupMasterKey, decryptedGroupState)!!
@@ -317,23 +317,23 @@ class GroupTableTest {
   private fun insertPushGroupWithSelfAndOthers(others: List<RecipientId>): GroupId {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
 
-    val selfMember: DecryptedMember = DecryptedMember.Builder()
-      .aciBytes(harness.self.requireAci().toByteString())
-      .joinedAtRevision(0)
-      .role(Member.Role.DEFAULT)
+    val selfMember: DecryptedMember = DecryptedMember.newBuilder()
+      .setAciBytes(harness.self.requireAci().toByteString())
+      .setJoinedAtRevision(0)
+      .setRole(Member.Role.DEFAULT)
       .build()
 
     val otherMembers: List<DecryptedMember> = others.map { id ->
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(id).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setAciBytes(Recipient.resolved(id).requireAci().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
         .build()
     }
 
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(listOf(selfMember) + otherMembers)
-      .revision(0)
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(listOf(selfMember) + otherMembers)
+      .setRevision(0)
       .build()
 
     return groupTable.create(groupMasterKey, decryptedGroupState)!!

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

@@ -1,288 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import org.junit.Test
-import org.signal.core.util.forEach
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireNonNullString
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.thoughtcrime.securesms.crash.CrashConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.testing.assertIs
-
-class LogDatabaseTest {
-
-  private val db: LogDatabase = LogDatabase.getInstance(ApplicationDependencies.getApplication())
-
-  @Test
-  fun crashTable_matchesNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessageAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_doesNotMatchNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNamePatternButPromptedTooRecently() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.writableDatabase
-      .update(LogDatabase.CrashTable.TABLE_NAME)
-      .values(LogDatabase.CrashTable.LAST_PROMPTED_AT to currentTime)
-      .run()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_noMatches() {
-    val currentTime = System.currentTimeMillis()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_updatesLastPromptTime() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "XXX",
-      message = "XXX",
-      stackTrace = "XXX"
-    )
-
-    db.crashes.markAsPrompted(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptedAt = currentTime
-    )
-
-    db.writableDatabase
-      .select(LogDatabase.CrashTable.NAME, LogDatabase.CrashTable.LAST_PROMPTED_AT)
-      .from(LogDatabase.CrashTable.TABLE_NAME)
-      .run()
-      .forEach {
-        if (it.requireNonNullString(LogDatabase.CrashTable.NAME) == "TestName") {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs currentTime
-        } else {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs 0
-        }
-      }
-  }
-}

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

@@ -48,7 +48,7 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -62,7 +62,7 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
     mms.setOutgoingGiftsRevealed(listOf(messageId))
 
@@ -76,13 +76,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -96,13 +96,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
@@ -115,13 +115,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
@@ -140,13 +140,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(
@@ -165,13 +165,13 @@ class MessageTableTest_gifts {
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(

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

@@ -502,18 +502,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectNoSessionSwitchoverEvent()
     }
 
-    test("steal, e164+pni+aci * pni+aci, all provided, aci sessions but not pni sessions, no SSE expected") {
-      given(E164_A, PNI_A, ACI_A, createThread = true, aciSession = true, pniSession = false)
-      given(null, PNI_B, ACI_B, createThread = false, aciSession = true, pniSession = false)
-
-      process(E164_A, PNI_B, ACI_A)
-
-      expect(E164_A, PNI_B, ACI_A)
-      expect(null, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
     test("merge, e164 & pni & aci, all provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -1240,7 +1228,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          ThreadMergeEvent.ADAPTER.decode(bytes)
+          ThreadMergeEvent.parseFrom(bytes)
         } else {
           null
         }
@@ -1258,7 +1246,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          SessionSwitchoverEvent.ADAPTER.decode(bytes)
+          SessionSwitchoverEvent.parseFrom(bytes)
         } else {
           null
         }

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

@@ -22,9 +22,8 @@ import org.thoughtcrime.securesms.testing.MessageContentFuzzer
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.EditMessage
-import org.whispersystems.signalservice.internal.push.SyncMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.EditMessage
 import kotlin.time.Duration.Companion.seconds
 
 @RunWith(AndroidJUnit4::class)
@@ -68,17 +67,16 @@ class EditMessageSyncProcessorTest {
 
       val content = MessageContentFuzzer.fuzzTextMessage()
       val metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, toRecipient.id)
-      val syncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(originalTimestamp)
-            .expirationStartTimestamp(originalTimestamp)
-            .message(content.dataMessage)
-            .build()
-        ).build()
+      val syncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
+            .setTimestamp(originalTimestamp)
+            .setExpirationStartTimestamp(originalTimestamp)
+            .setMessage(content.dataMessage)
+        )
       ).build()
-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage?.expireTimer ?: 0)
+      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage.expireTimer)
       val syncTextMessage = TestMessage(
         envelope = MessageContentFuzzer.envelope(originalTimestamp),
         content = syncContent,
@@ -88,20 +86,18 @@ class EditMessageSyncProcessorTest {
 
       val editTimestamp = originalTimestamp + 200
       val editedContent = MessageContentFuzzer.fuzzTextMessage()
-      val editSyncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(editTimestamp)
-            .expirationStartTimestamp(editTimestamp)
-            .editMessage(
-              EditMessage.Builder()
-                .dataMessage(editedContent.dataMessage)
-                .targetSentTimestamp(originalTimestamp)
-                .build()
+      val editSyncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
+            .setTimestamp(editTimestamp)
+            .setExpirationStartTimestamp(editTimestamp)
+            .setEditMessage(
+              EditMessage.newBuilder()
+                .setDataMessage(editedContent.dataMessage)
+                .setTargetSentTimestamp(originalTimestamp)
             )
-            .build()
-        ).build()
+        )
       ).build()
 
       val syncEditMessage = TestMessage(
@@ -113,38 +109,38 @@ class EditMessageSyncProcessorTest {
 
       testResult.runSync(listOf(syncTextMessage, syncEditMessage))
 
-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, (content.dataMessage?.expireTimer ?: 0) / 1000)
+      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage.expireTimer / 1000)
       val originalTextMessage = OutgoingMessage(
         threadRecipient = toRecipient,
         sentTimeMillis = originalTimestamp,
-        body = content.dataMessage?.body ?: "",
-        expiresIn = content.dataMessage?.expireTimer?.seconds?.inWholeMilliseconds ?: 0,
+        body = content.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
         isUrgent = true,
         isSecure = true,
-        bodyRanges = content.dataMessage?.bodyRanges.toBodyRangeList()
+        bodyRanges = content.dataMessage.bodyRangesList.toBodyRangeList()
       )
       val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(toRecipient)
       val originalMessageId = SignalDatabase.messages.insertMessageOutbox(originalTextMessage, threadId, false, null)
       SignalDatabase.messages.markAsSent(originalMessageId, true)
-      if ((content.dataMessage?.expireTimer ?: 0) > 0) {
+      if (content.dataMessage.expireTimer > 0) {
         SignalDatabase.messages.markExpireStarted(originalMessageId, originalTimestamp)
       }
 
       val editMessage = OutgoingMessage(
         threadRecipient = toRecipient,
         sentTimeMillis = editTimestamp,
-        body = editedContent.dataMessage?.body ?: "",
-        expiresIn = content.dataMessage?.expireTimer?.seconds?.inWholeMilliseconds ?: 0,
+        body = editedContent.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
         isUrgent = true,
         isSecure = true,
-        bodyRanges = editedContent.dataMessage?.bodyRanges.toBodyRangeList(),
+        bodyRanges = editedContent.dataMessage.bodyRangesList.toBodyRangeList(),
         messageToEdit = originalMessageId
       )
 
       val editMessageId = SignalDatabase.messages.insertMessageOutbox(editMessage, threadId, false, null)
       SignalDatabase.messages.markAsSent(editMessageId, true)
 
-      if ((content.dataMessage?.expireTimer ?: 0) > 0) {
+      if (content.dataMessage.expireTimer > 0) {
         SignalDatabase.messages.markExpireStarted(editMessageId, originalTimestamp)
       }
       testResult.collectLocal()
@@ -171,7 +167,7 @@ class EditMessageSyncProcessorTest {
 
     fun runSync(messages: List<TestMessage>) {
       messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
-        if (content.syncMessage != null) {
+        if (content.hasSyncMessage()) {
           processorV2.process(
             envelope,
             content,

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

@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.messages
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import okio.ByteString.Companion.toByteString
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 import org.thoughtcrime.securesms.testing.GroupTestingUtils
 import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember
@@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.testing.MessageContentFuzzer
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.GroupContextV2
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
@@ -41,9 +41,9 @@ class MessageContentProcessor__recipientStatusTest {
   @Test
   fun syncGroupSentTextMessageWithRecipientUpdateFollowup() {
     val (groupId, masterKey, groupRecipientId) = GroupTestingUtils.insertGroup(revision = 0, harness.self.asMember(), harness.others[0].asMember(), harness.others[1].asMember())
-    val groupContextV2 = GroupContextV2.Builder().revision(0).masterKey(masterKey.serialize().toByteString()).build()
+    val groupContextV2 = GroupContextV2.newBuilder().setRevision(0).setMasterKey(masterKey.serialize().toProtoByteString()).build()
 
-    val initialTextMessage = DataMessage.Builder().buildWith {
+    val initialTextMessage = DataMessage.newBuilder().buildWith {
       body = MessageContentFuzzer.string()
       groupV2 = groupContextV2
       timestamp = envelopeTimestamp

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

@@ -6,6 +6,7 @@ import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
 import okio.ByteString
+import okio.ByteString.Companion.toByteString
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
@@ -25,7 +26,7 @@ import org.thoughtcrime.securesms.testing.Entry
 import org.thoughtcrime.securesms.testing.FakeClientHelpers
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.awaitFor
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
 import org.whispersystems.signalservice.internal.websocket.WebSocketMessage
 import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
 import java.util.regex.Pattern
@@ -92,7 +93,7 @@ class MessageProcessingPerformanceTest {
     val messageCount = 100
     val envelopes = generateInboundEnvelopes(bobClient, messageCount)
     val firstTimestamp = envelopes.first().timestamp
-    val lastTimestamp = envelopes.last().timestamp ?: 0
+    val lastTimestamp = envelopes.last().timestamp
 
     // Inject the envelopes into the websocket
     Thread {
@@ -189,7 +190,7 @@ class MessageProcessingPerformanceTest {
         path = "/api/v1/message",
         id = Random(System.currentTimeMillis()).nextLong(),
         headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
-        body = this.encodeByteString()
+        body = this.toByteArray().toByteString()
       )
     ).encodeByteString()
   }

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

@@ -1,12 +1,11 @@
 package org.thoughtcrime.securesms.messages
 
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 
 data class TestMessage(
-  val envelope: Envelope,
-  val content: Content,
+  val envelope: SignalServiceProtos.Envelope,
+  val content: SignalServiceProtos.Content,
   val metadata: EnvelopeMetadata,
   val serverDeliveredTimestamp: Long
 )

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

@@ -5,8 +5,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testing.LogPredicate
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 
 class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(context) {
   companion object {
@@ -20,9 +19,9 @@ class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(
     fun endTag(timestamp: Long) = "$timestamp end"
   }
 
-  override fun process(envelope: Envelope, content: Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
-    Log.d(TAG, startTag(envelope.timestamp!!))
+  override fun process(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
+    Log.d(TAG, startTag(envelope.timestamp))
     super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
-    Log.d(TAG, endTag(envelope.timestamp!!))
+    Log.d(TAG, endTag(envelope.timestamp))
   }
 }

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

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
 
 /**
  * Welcome to Alice's Client.

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

@@ -31,10 +31,11 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
 import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantLock
+import kotlin.UnsupportedOperationException
 
 /**
  * Welcome to Bob's Client.
@@ -60,7 +61,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
   }
 
   /** Inspired by SignalServiceMessageSender#getEncryptedMessage */
-  fun encrypt(now: Long): Envelope {
+  fun encrypt(now: Long): SignalServiceProtos.Envelope {
     val envelopeContent = FakeClientHelpers.encryptedTextMessage(now)
 
     val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)
@@ -71,10 +72,10 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     }
 
     return cipher.encrypt(getAliceProtocolAddress(), getAliceUnidentifiedAccess(), envelopeContent)
-      .toEnvelope(envelopeContent.content.get().dataMessage!!.timestamp!!, getAliceServiceId())
+      .toEnvelope(envelopeContent.content.get().dataMessage.timestamp, getAliceServiceId())
   }
 
-  fun decrypt(envelope: Envelope, serverDeliveredTimestamp: Long) {
+  fun decrypt(envelope: SignalServiceProtos.Envelope, serverDeliveredTimestamp: Long) {
     val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, UnidentifiedAccessUtil.getCertificateValidator())
     cipher.decrypt(envelope, serverDeliveredTimestamp)
   }

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.testing
 
-import okio.ByteString.Companion.toByteString
 import org.signal.libsignal.internal.Native
 import org.signal.libsignal.internal.NativeHandleGuard
 import org.signal.libsignal.metadata.certificate.CertificateValidator
@@ -10,16 +9,15 @@ import org.signal.libsignal.protocol.ecc.Curve
 import org.signal.libsignal.protocol.ecc.ECKeyPair
 import org.signal.libsignal.protocol.ecc.ECPublicKey
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.whispersystems.signalservice.api.crypto.ContentHint
 import org.whispersystems.signalservice.api.crypto.EnvelopeContent
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair
 import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.Envelope
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
 import org.whispersystems.util.Base64
 import java.util.Optional
 import java.util.UUID
@@ -54,9 +52,9 @@ object FakeClientHelpers {
   }
 
   fun encryptedTextMessage(now: Long, message: String = "Test body message"): EnvelopeContent {
-    val content = Content.Builder().apply {
-      dataMessage(
-        DataMessage.Builder().buildWith {
+    val content = SignalServiceProtos.Content.newBuilder().apply {
+      setDataMessage(
+        SignalServiceProtos.DataMessage.newBuilder().apply {
           body = message
           timestamp = now
         }
@@ -66,16 +64,16 @@ object FakeClientHelpers {
   }
 
   fun OutgoingPushMessage.toEnvelope(timestamp: Long, destination: ServiceId): Envelope {
-    return Envelope.Builder()
-      .type(Envelope.Type.fromValue(this.type))
-      .sourceDevice(1)
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 1)
-      .destinationServiceId(destination.toString())
-      .serverGuid(UUID.randomUUID().toString())
-      .content(Base64.decode(this.content).toByteString())
-      .urgent(true)
-      .story(false)
+    return Envelope.newBuilder()
+      .setType(Envelope.Type.valueOf(this.type))
+      .setSourceDevice(1)
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 1)
+      .setDestinationServiceId(destination.toString())
+      .setServerGuid(UUID.randomUUID().toString())
+      .setContent(Base64.decode(this.content).toProtoByteString())
+      .setUrgent(true)
+      .setStory(false)
       .build()
   }
 }

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

@@ -16,19 +16,19 @@ import kotlin.random.Random
  */
 object GroupTestingUtils {
   fun member(aci: ACI, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
-    return DecryptedMember.Builder()
-      .aciBytes(aci.toByteString())
-      .joinedAtRevision(revision)
-      .role(role)
+    return DecryptedMember.newBuilder()
+      .setAciBytes(aci.toByteString())
+      .setJoinedAtRevision(revision)
+      .setRole(role)
       .build()
   }
 
   fun insertGroup(revision: Int = 0, vararg members: DecryptedMember): TestGroupInfo {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(members.toList())
-      .revision(revision)
-      .title(MessageContentFuzzer.string())
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members.toList())
+      .setRevision(revision)
+      .setTitle(MessageContentFuzzer.string())
       .build()
 
     val groupId = SignalDatabase.groups.create(groupMasterKey, decryptedGroupState)!!

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

@@ -1,20 +1,21 @@
 package org.thoughtcrime.securesms.testing
 
-import okio.ByteString
-import okio.ByteString.Companion.toByteString
+import com.google.protobuf.ByteString
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 import org.thoughtcrime.securesms.messages.TestMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.AttachmentPointer
-import org.whispersystems.signalservice.internal.push.BodyRange
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.Envelope
-import org.whispersystems.signalservice.internal.push.GroupContextV2
-import org.whispersystems.signalservice.internal.push.SyncMessage
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.AttachmentPointer
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Content
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage
 import java.util.UUID
 import kotlin.random.Random
 import kotlin.random.nextInt
@@ -34,10 +35,10 @@ object MessageContentFuzzer {
    * Create an [Envelope].
    */
   fun envelope(timestamp: Long): Envelope {
-    return Envelope.Builder()
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 5)
-      .serverGuid(UUID.randomUUID().toString())
+    return Envelope.newBuilder()
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 5)
+      .setServerGuidBytes(UuidUtil.toByteString(UUID.randomUUID()))
       .build()
   }
 
@@ -61,22 +62,20 @@ object MessageContentFuzzer {
    * - Bold style body ranges
    */
   fun fuzzTextMessage(groupContextV2: GroupContextV2? = null): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
           body = string()
           if (random.nextBoolean()) {
             expireTimer = random.nextInt(0..28.days.inWholeSeconds.toInt())
           }
           if (random.nextBoolean()) {
-            bodyRanges(
-              listOf(
-                BodyRange.Builder().buildWith {
-                  start = 0
-                  length = 1
-                  style = BodyRange.Style.BOLD
-                }
-              )
+            addBodyRanges(
+              SignalServiceProtos.BodyRange.newBuilder().buildWith {
+                start = 0
+                length = 1
+                style = SignalServiceProtos.BodyRange.Style.BOLD
+              }
             )
           }
           if (groupContextV2 != null) {
@@ -96,16 +95,16 @@ object MessageContentFuzzer {
     recipientUpdate: Boolean = false
   ): Content {
     return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage.Builder().buildWith {
-          sent = SyncMessage.Sent.Builder().buildWith {
+      .newBuilder()
+      .setSyncMessage(
+        SyncMessage.newBuilder().buildWith {
+          sent = SyncMessage.Sent.newBuilder().buildWith {
             timestamp = textMessage.timestamp
             message = textMessage
             isRecipientUpdate = recipientUpdate
-            unidentifiedStatus(
+            addAllUnidentifiedStatus(
               deliveredTo.map {
-                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder().buildWith {
+                SyncMessage.Sent.UnidentifiedDeliveryStatus.newBuilder().buildWith {
                   destinationServiceId = Recipient.resolved(it).requireServiceId().toString()
                   unidentified = true
                 }
@@ -124,9 +123,9 @@ object MessageContentFuzzer {
    * - A message with 0-2 attachment pointers and may contain a text body
    */
   fun fuzzMediaMessageWithBody(quoteAble: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
           if (random.nextBoolean()) {
             body = string()
           }
@@ -134,28 +133,28 @@ object MessageContentFuzzer {
           if (random.nextBoolean() && quoteAble.isNotEmpty()) {
             body = string()
             val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
+            quote = DataMessage.Quote.newBuilder().buildWith {
               id = quoted.envelope.timestamp
               authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
-              attachments(quoted.content.dataMessage?.attachments ?: emptyList())
-              bodyRanges(quoted.content.dataMessage?.bodyRanges ?: emptyList())
+              text = quoted.content.dataMessage.body
+              addAllAttachments(quoted.content.dataMessage.attachmentsList)
+              addAllBodyRanges(quoted.content.dataMessage.bodyRangesList)
               type = DataMessage.Quote.Type.NORMAL
             }
           }
 
           if (random.nextFloat() < 0.1 && quoteAble.isNotEmpty()) {
             val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
-              id = random.nextLong(quoted.envelope.timestamp!! - 1000000, quoted.envelope.timestamp!!)
+            quote = DataMessage.Quote.newBuilder().buildWith {
+              id = random.nextLong(quoted.envelope.timestamp - 1000000, quoted.envelope.timestamp)
               authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
+              text = quoted.content.dataMessage.body
             }
           }
 
           if (random.nextFloat() < 0.25) {
             val total = random.nextInt(1, 2)
-            attachments((0..total).map { attachmentPointer() })
+            (0..total).forEach { _ -> addAttachments(attachmentPointer()) }
           }
         }
       )
@@ -167,12 +166,12 @@ object MessageContentFuzzer {
    * - A reaction to a prior message
    */
   fun fuzzMediaMessageNoContent(previousMessages: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
           if (random.nextFloat() < 0.25) {
             val reactTo = previousMessages.random(random)
-            reaction = DataMessage.Reaction.Builder().buildWith {
+            reaction = DataMessage.Reaction.newBuilder().buildWith {
               emoji = emojis.random(random)
               remove = false
               targetAuthorAci = reactTo.metadata.sourceServiceId.toString()
@@ -188,15 +187,15 @@ object MessageContentFuzzer {
    * - A sticker
    */
   fun fuzzMediaMessageNoText(previousMessages: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
           if (random.nextFloat() < 0.9) {
-            sticker = DataMessage.Sticker.Builder().buildWith {
+            sticker = DataMessage.Sticker.newBuilder().buildWith {
               packId = byteString(length = 24)
               packKey = byteString(length = 128)
               stickerId = random.nextInt()
-              data_ = attachmentPointer()
+              data = attachmentPointer()
               emoji = emojis.random(random)
             }
           }
@@ -224,14 +223,14 @@ object MessageContentFuzzer {
    * Generate a random [ByteString].
    */
   fun byteString(length: Int = 512): ByteString {
-    return random.nextBytes(length).toByteString()
+    return random.nextBytes(length).toProtoByteString()
   }
 
   /**
    * Generate a random [AttachmentPointer].
    */
   fun attachmentPointer(): AttachmentPointer {
-    return AttachmentPointer.Builder().run {
+    return AttachmentPointer.newBuilder().run {
       cdnKey = string()
       contentType = mediaTypes.random(random)
       key = byteString()

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.ACI
+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(ACI.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()
+      .setAuthorAci(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/benchmark/java/org/signal/benchmark/setup/TestMessages.kt

@@ -149,7 +149,6 @@ object TestMessages {
       1024,
       Optional.empty(),
       Optional.empty(),
-      0,
       Optional.of("/not-there.jpg"),
       false,
       false,
@@ -172,7 +171,6 @@ object TestMessages {
       1024,
       Optional.empty(),
       Optional.empty(),
-      0,
       Optional.of("/not-there.aac"),
       true,
       false,

app/src/main/AndroidManifest.xml

@@ -252,7 +252,6 @@
 
     <activity-alias android:name=".RoutingActivity"
                     android:targetActivity=".MainActivity"
-                    android:resizeableActivity="true"
                     android:exported="true">
 
         <intent-filter>
@@ -631,7 +630,6 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:parentActivityName=".MainActivity"
-              android:resizeableActivity="true"
               android:exported="false">
         <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -1031,7 +1029,6 @@
     <activity android:name=".MainActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:resizeableActivity="true"
               android:exported="false"/>
 
     <activity android:name=".pin.PinRestoreActivity"

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

@@ -90,6 +90,8 @@ import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.PowerManagerCompat;
+import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -122,6 +124,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private static final String TAG = Log.tag(ApplicationContext.class);
 
+  @VisibleForTesting
+  protected PersistentLogger persistentLogger;
+
   public static ApplicationContext getInstance(Context context) {
     return (ApplicationContext)context.getApplicationContext();
   }
@@ -260,6 +265,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     MemoryTracker.stop();
   }
 
+  public PersistentLogger getPersistentLogger() {
+    return persistentLogger;
+  }
+
   public void checkBuildExpiration() {
     if (Util.getTimeUntilBuildExpiry() <= 0 && !SignalStore.misc().isClientDeprecated()) {
       Log.w(TAG, "Build expired!");
@@ -286,14 +295,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @VisibleForTesting
   protected void initializeLogging() {
-    Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
+    persistentLogger = new PersistentLogger(this);
+    org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);
 
     SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
 
     SignalExecutors.UNBOUNDED.execute(() -> {
       Log.blockUntilAllWritesFinished();
-      LogDatabase.getInstance(this).logs().trimToSize();
-      LogDatabase.getInstance(this).crashes().trimToSize();
+      LogDatabase.getInstance(this).trimToSize();
     });
   }
 

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.transition.TransitionInflater;
 import android.view.View;

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -17,6 +18,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.ConfigurationUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 

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

@@ -35,6 +35,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
@@ -49,7 +50,6 @@ import androidx.transition.TransitionManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
-import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
@@ -73,6 +73,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CommunicationActions;
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -84,7 +85,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -519,10 +519,6 @@ public final class ContactSelectionListFragment extends LoggingFragment {
   }
 
   public void setQueryFilter(String filter) {
-    if (Objects.equals(filter, this.cursorFilter)) {
-      return;
-    }
-
     this.cursorFilter = filter;
     contactSearchMediator.onFilterChanged(filter);
   }
@@ -546,6 +542,10 @@ public final class ContactSelectionListFragment extends LoggingFragment {
     headerActionView.setVisibility(View.GONE);
   }
 
+  public void setRecyclerViewPaddingBottom(@Px int paddingBottom) {
+    ViewUtil.setPaddingBottom(recyclerView, paddingBottom);
+  }
+
   private void onLoadFinished(int count) {
     swipeRefresh.setVisibility(View.VISIBLE);
     showContactsLayout.setVisibility(View.GONE);

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

@@ -5,11 +5,13 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;

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

@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSh
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
-import org.thoughtcrime.securesms.notifications.VitalsViewModel;
+import org.thoughtcrime.securesms.notifications.SlowNotificationsViewModel;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -45,7 +45,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
   private VoiceNoteMediaController      mediaController;
   private ConversationListTabsViewModel conversationListTabsViewModel;
-  private VitalsViewModel               vitalsViewModel;
+  private SlowNotificationsViewModel    slowNotificationsViewModel;
 
   private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
 
@@ -99,27 +99,25 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
     updateTabVisibility();
 
-    vitalsViewModel = new ViewModelProvider(this).get(VitalsViewModel.class);
+    slowNotificationsViewModel = new ViewModelProvider(this).get(SlowNotificationsViewModel.class);
 
     lifecycleDisposable.add(
-        vitalsViewModel
-            .getVitalsState()
-            .subscribe(this::presentVitalsState)
+        slowNotificationsViewModel
+            .getSlowNotificationState()
+            .subscribe(this::presentSlowNotificationState)
     );
   }
 
   @SuppressLint("NewApi")
-  private void presentVitalsState(VitalsViewModel.State state) {
-    switch (state) {
+  private void presentSlowNotificationState(SlowNotificationsViewModel.State slowNotificationState) {
+    switch (slowNotificationState) {
       case NONE:
         break;
       case PROMPT_BATTERY_SAVER_DIALOG:
         PromptBatterySaverDialogFragment.show(getSupportFragmentManager());
         break;
-      case PROMPT_DEBUGLOGS_FOR_NOTIFICATIONS:
-        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.NOTIFICATIONS);
-      case PROMPT_DEBUGLOGS_FOR_CRASH:
-        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.CRASH);
+      case PROMPT_DEBUGLOGS:
+        DebugLogsPromptDialogFragment.show(this, getSupportFragmentManager());
         break;
     }
   }
@@ -170,7 +168,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
     updateTabVisibility();
 
-    vitalsViewModel.checkSlowNotificationHeuristics();
+    slowNotificationsViewModel.checkSlowNotificationHeuristics();
   }
 
   @Override

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

@@ -21,6 +21,7 @@ import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;

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

@@ -53,12 +53,11 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.core.util.logging.Log;
+import org.signal.libsignal.protocol.IdentityKey;
 import org.thoughtcrime.securesms.components.TooltipPopup;
 import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.webrtc.CallLinkInfoSheet;
-import org.thoughtcrime.securesms.components.webrtc.CallLinkProfileKeySender;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
 import org.thoughtcrime.securesms.components.webrtc.CallStateUpdatePopupWindow;
@@ -74,7 +73,6 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls;
 import org.thoughtcrime.securesms.components.webrtc.WifiToCellularPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
-import org.thoughtcrime.securesms.components.webrtc.requests.CallLinkIncomingRequestSheet;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -100,7 +98,6 @@ import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState;
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -777,10 +774,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       return;
     }
 
-    if (state.isCallLink()) {
-      CallLinkProfileKeySender.onSendAnyway(new HashSet<>(changedRecipients));
-    }
-
     if (state.getGroupCallState().isConnected()) {
       ApplicationDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
     } else {
@@ -1095,11 +1088,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     public void onLaunchPendingRequestsSheet() {
       new PendingParticipantsBottomSheet().show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
     }
-
-    @Override
-    public void onLaunchRecipientSheet(@NonNull Recipient pendingRecipient) {
-      CallLinkIncomingRequestSheet.show(getSupportFragmentManager(), pendingRecipient.getId());
-    }
   }
 
   private class WindowLayoutInfoConsumer implements Consumer<WindowLayoutInfo> {

app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt

@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.absbackup.backupables
 
+import com.google.protobuf.InvalidProtocolBufferException
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.absbackup.AndroidBackupItem
 import org.thoughtcrime.securesms.absbackup.protos.SvrAuthToken
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import java.io.IOException
 
 /**
  * This backs up the not-secret KBS Auth tokens, which can be combined with a PIN to prove ownership of a phone number in order to complete the registration process.
@@ -30,7 +30,7 @@ object SvrAuthTokens : AndroidBackupItem {
       val proto = SvrAuthToken.ADAPTER.decode(data)
 
       SignalStore.svr().putAuthTokenList(proto.tokens)
-    } catch (e: IOException) {
+    } catch (e: InvalidProtocolBufferException) {
       Log.w(TAG, "Cannot restore KbsAuthToken from backup service.")
     }
   }

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

@@ -1,28 +1,17 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.os.ParcelCompat;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
-import org.thoughtcrime.securesms.util.ParcelUtil;
 
-import java.util.Objects;
-
-public abstract class Attachment implements Parcelable {
+public abstract class Attachment {
 
   @NonNull
   private final String  contentType;
@@ -59,7 +48,6 @@ public abstract class Attachment implements Parcelable {
   private final int     height;
   private final boolean quote;
   private final long    uploadTimestamp;
-  private final int     incrementalMacChunkSize;
 
   @Nullable
   private final String caption;
@@ -92,7 +80,6 @@ public abstract class Attachment implements Parcelable {
                     boolean videoGif,
                     int width,
                     int height,
-                    int incrementalMacChunkSize,
                     boolean quote,
                     long uploadTimestamp,
                     @Nullable String caption,
@@ -101,95 +88,31 @@ public abstract class Attachment implements Parcelable {
                     @Nullable AudioHash audioHash,
                     @Nullable TransformProperties transformProperties)
   {
-    this.contentType             = contentType;
-    this.transferState           = transferState;
-    this.size                    = size;
-    this.fileName                = fileName;
-    this.cdnNumber               = cdnNumber;
-    this.location                = location;
-    this.key                     = key;
-    this.relay                   = relay;
-    this.digest                  = digest;
-    this.incrementalDigest       = incrementalDigest;
-    this.fastPreflightId         = fastPreflightId;
-    this.voiceNote               = voiceNote;
-    this.borderless              = borderless;
-    this.videoGif                = videoGif;
-    this.width                   = width;
-    this.height                  = height;
-    this.incrementalMacChunkSize = incrementalMacChunkSize;
-    this.quote                   = quote;
-    this.uploadTimestamp         = uploadTimestamp;
-    this.stickerLocator          = stickerLocator;
-    this.caption                 = caption;
-    this.blurHash                = blurHash;
-    this.audioHash               = audioHash;
-    this.transformProperties     = transformProperties != null ? transformProperties : TransformProperties.empty();
+    this.contentType         = contentType;
+    this.transferState       = transferState;
+    this.size                = size;
+    this.fileName            = fileName;
+    this.cdnNumber           = cdnNumber;
+    this.location            = location;
+    this.key                 = key;
+    this.relay               = relay;
+    this.digest              = digest;
+    this.incrementalDigest   = incrementalDigest;
+    this.fastPreflightId     = fastPreflightId;
+    this.voiceNote           = voiceNote;
+    this.borderless          = borderless;
+    this.videoGif            = videoGif;
+    this.width               = width;
+    this.height              = height;
+    this.quote               = quote;
+    this.uploadTimestamp     = uploadTimestamp;
+    this.stickerLocator      = stickerLocator;
+    this.caption             = caption;
+    this.blurHash            = blurHash;
+    this.audioHash           = audioHash;
+    this.transformProperties = transformProperties != null ? transformProperties : TransformProperties.empty();
   }
 
-  protected Attachment(Parcel in) {
-    this.contentType             = Objects.requireNonNull(in.readString());
-    this.transferState           = in.readInt();
-    this.size                    = in.readLong();
-    this.fileName                = in.readString();
-    this.cdnNumber               = in.readInt();
-    this.location                = in.readString();
-    this.key                     = in.readString();
-    this.relay                   = in.readString();
-    this.digest                  = ParcelUtil.readByteArray(in);
-    this.incrementalDigest       = ParcelUtil.readByteArray(in);
-    this.fastPreflightId         = in.readString();
-    this.voiceNote               = ParcelUtil.readBoolean(in);
-    this.borderless              = ParcelUtil.readBoolean(in);
-    this.videoGif                = ParcelUtil.readBoolean(in);
-    this.width                   = in.readInt();
-    this.height                  = in.readInt();
-    this.incrementalMacChunkSize = in.readInt();
-    this.quote                   = ParcelUtil.readBoolean(in);
-    this.uploadTimestamp         = in.readLong();
-    this.stickerLocator          = ParcelCompat.readParcelable(in, StickerLocator.class.getClassLoader(), StickerLocator.class);
-    this.caption                 = in.readString();
-    this.blurHash                = ParcelCompat.readParcelable(in, BlurHash.class.getClassLoader(), BlurHash.class);
-    this.audioHash               = ParcelCompat.readParcelable(in, AudioHash.class.getClassLoader(), AudioHash.class);
-    this.transformProperties     = Objects.requireNonNull(ParcelCompat.readParcelable(in, TransformProperties.class.getClassLoader(), TransformProperties.class));
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    AttachmentCreator.writeSubclass(dest, this);
-    dest.writeString(contentType);
-    dest.writeInt(transferState);
-    dest.writeLong(size);
-    dest.writeString(fileName);
-    dest.writeInt(cdnNumber);
-    dest.writeString(location);
-    dest.writeString(key);
-    dest.writeString(relay);
-    ParcelUtil.writeByteArray(dest, digest);
-    ParcelUtil.writeByteArray(dest, incrementalDigest);
-    dest.writeString(fastPreflightId);
-    ParcelUtil.writeBoolean(dest, voiceNote);
-    ParcelUtil.writeBoolean(dest, borderless);
-    ParcelUtil.writeBoolean(dest, videoGif);
-    dest.writeInt(width);
-    dest.writeInt(height);
-    dest.writeInt(incrementalMacChunkSize);
-    ParcelUtil.writeBoolean(dest, quote);
-    dest.writeLong(uploadTimestamp);
-    dest.writeParcelable(stickerLocator, 0);
-    dest.writeString(caption);
-    dest.writeParcelable(blurHash, 0);
-    dest.writeParcelable(audioHash, 0);
-    dest.writeParcelable(transformProperties, 0);
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  public static final Creator<Attachment> CREATOR = AttachmentCreator.INSTANCE;
-
   @Nullable
   public abstract Uri getUri();
 
@@ -249,11 +172,7 @@ public abstract class Attachment implements Parcelable {
 
   @Nullable
   public byte[] getIncrementalDigest() {
-    if (incrementalDigest != null && incrementalDigest.length > 0) {
-      return incrementalDigest;
-    } else {
-      return null;
-    }
+    return incrementalDigest;
   }
 
   @Nullable
@@ -281,10 +200,6 @@ public abstract class Attachment implements Parcelable {
     return height;
   }
 
-  public int getIncrementalMacChunkSize() {
-    return incrementalMacChunkSize;
-  }
-
   public boolean isQuote() {
     return quote;
   }

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.attachments
-
-import android.os.Parcel
-import android.os.Parcelable
-
-/**
- * Parcelable Creator for Attachments. Encapsulates the logic around dealing with
- * subclasses, since Attachment is abstract and has several children.
- */
-object AttachmentCreator : Parcelable.Creator<Attachment> {
-  enum class Subclass(val clazz: Class<out Attachment>, val code: String) {
-    DATABASE(DatabaseAttachment::class.java, "database"),
-    MMS_NOTIFICATION(MmsNotificationAttachment::class.java, "mms_notification"),
-    POINTER(PointerAttachment::class.java, "pointer"),
-    TOMBSTONE(TombstoneAttachment::class.java, "tombstone"),
-    URI(UriAttachment::class.java, "uri")
-  }
-
-  @JvmStatic
-  fun writeSubclass(dest: Parcel, instance: Attachment) {
-    val subclass = Subclass.values().firstOrNull { it.clazz == instance::class.java } ?: error("Unexpected subtype ${instance::class.java.simpleName}")
-    dest.writeString(subclass.code)
-  }
-
-  override fun createFromParcel(source: Parcel): Attachment {
-    val rawCode = source.readString()!!
-
-    return when (Subclass.values().first { rawCode == it.code }) {
-      Subclass.DATABASE -> DatabaseAttachment(source)
-      Subclass.MMS_NOTIFICATION -> MmsNotificationAttachment(source)
-      Subclass.POINTER -> PointerAttachment(source)
-      Subclass.TOMBSTONE -> TombstoneAttachment(source)
-      Subclass.URI -> UriAttachment(source)
-    }
-  }
-
-  override fun newArray(size: Int): Array<Attachment?> = arrayOfNulls(size)
-}

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

@@ -1,11 +1,8 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.os.Parcel;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.os.ParcelCompat;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
@@ -13,7 +10,6 @@ import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.ParcelUtil;
 
 import java.util.Comparator;
 
@@ -39,7 +35,6 @@ public class DatabaseAttachment extends Attachment {
                             String relay,
                             byte[] digest,
                             byte[] incrementalDigest,
-                            int incrementalMacChunkSize,
                             String fastPreflightId,
                             boolean voiceNote,
                             boolean borderless,
@@ -55,7 +50,7 @@ public class DatabaseAttachment extends Attachment {
                             int displayOrder,
                             long uploadTimestamp)
   {
-    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, incrementalMacChunkSize, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;
@@ -63,25 +58,6 @@ public class DatabaseAttachment extends Attachment {
     this.displayOrder = displayOrder;
   }
 
-  protected DatabaseAttachment(Parcel in) {
-    super(in);
-    this.attachmentId = ParcelCompat.readParcelable(in, AttachmentId.class.getClassLoader(), AttachmentId.class);
-    this.hasData      = ParcelUtil.readBoolean(in);
-    this.hasThumbnail = ParcelUtil.readBoolean(in);
-    this.mmsId        = in.readLong();
-    this.displayOrder = in.readInt();
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    super.writeToParcel(dest, flags);
-    dest.writeParcelable(attachmentId, 0);
-    ParcelUtil.writeBoolean(dest, hasData);
-    ParcelUtil.writeBoolean(dest, hasThumbnail);
-    dest.writeLong(mmsId);
-    dest.writeInt(displayOrder);
-  }
-
   @Override
   @Nullable
   public Uri getUri() {

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

@@ -2,9 +2,7 @@ package org.thoughtcrime.securesms.attachments;
 
 
 import android.net.Uri;
-import android.os.Parcel;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentTable;
@@ -13,11 +11,7 @@ import org.thoughtcrime.securesms.database.MessageTable;
 public class MmsNotificationAttachment extends Attachment {
 
   public MmsNotificationAttachment(int status, long size) {
-    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, 0, false, 0, null, null, null, null, null);
-  }
-
-  protected MmsNotificationAttachment(Parcel in) {
-    super(in);
+    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, false, 0, null, null, null, null, null);
   }
 
   @Nullable

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

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.os.Parcel;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,7 +13,7 @@ import org.whispersystems.signalservice.api.InvalidMessageStructureException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.util.AttachmentPointerUtil;
-import org.whispersystems.signalservice.internal.push.DataMessage;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -32,7 +31,6 @@ public class PointerAttachment extends Attachment {
                             @Nullable String relay,
                             @Nullable byte[] digest,
                             @Nullable byte[] incrementalDigest,
-                            int incrementalMacChunkSize,
                             @Nullable String fastPreflightId,
                             boolean voiceNote,
                             boolean borderless,
@@ -44,11 +42,7 @@ public class PointerAttachment extends Attachment {
                             @Nullable StickerLocator stickerLocator,
                             @Nullable BlurHash blurHash)
   {
-    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, incrementalMacChunkSize, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
-  }
-
-  protected PointerAttachment(Parcel in) {
-    super(in);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
   }
 
   @Nullable
@@ -117,11 +111,9 @@ public class PointerAttachment extends Attachment {
                                              pointer.get().asPointer().getFileName().orElse(null),
                                              pointer.get().asPointer().getCdnNumber(),
                                              pointer.get().asPointer().getRemoteId().toString(),
-                                             encodedKey,
-                                             null,
+                                             encodedKey, null,
                                              pointer.get().asPointer().getDigest().orElse(null),
                                              pointer.get().asPointer().getIncrementalDigest().orElse(null),
-                                             pointer.get().asPointer().getIncrementalMacChunkSize(),
                                              fastPreflightId,
                                              pointer.get().asPointer().getVoiceNote(),
                                              pointer.get().asPointer().isBorderless(),
@@ -148,7 +140,6 @@ public class PointerAttachment extends Attachment {
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orElse(null) : null,
                                              thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().orElse(null) : null,
-                                             thumbnail != null ? thumbnail.asPointer().getIncrementalMacChunkSize() : 0,
                                              null,
                                              false,
                                              false,
@@ -161,25 +152,24 @@ public class PointerAttachment extends Attachment {
                                              null));
   }
 
-  public static Optional<Attachment> forPointer(DataMessage.Quote.QuotedAttachment quotedAttachment) {
+  public static Optional<Attachment> forPointer(SignalServiceProtos.DataMessage.Quote.QuotedAttachment quotedAttachment) {
     SignalServiceAttachment thumbnail;
     try {
-      thumbnail = quotedAttachment.thumbnail != null ? AttachmentPointerUtil.createSignalAttachmentPointer(quotedAttachment.thumbnail) : null;
+      thumbnail = quotedAttachment.hasThumbnail() ? AttachmentPointerUtil.createSignalAttachmentPointer(quotedAttachment.getThumbnail()) : null;
     } catch (InvalidMessageStructureException e) {
       return Optional.empty();
     }
 
-    return Optional.of(new PointerAttachment(quotedAttachment.contentType,
+    return Optional.of(new PointerAttachment(quotedAttachment.getContentType(),
                                              AttachmentTable.TRANSFER_PROGRESS_PENDING,
                                              thumbnail != null ? thumbnail.asPointer().getSize().orElse(0) : 0,
-                                             quotedAttachment.fileName,
+                                             quotedAttachment.getFileName(),
                                              thumbnail != null ? thumbnail.asPointer().getCdnNumber() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getRemoteId().toString() : "0",
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orElse(null) : null,
                                              thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().orElse(null) : null,
-                                             thumbnail != null ? thumbnail.asPointer().getIncrementalMacChunkSize() : 0,
                                              null,
                                              false,
                                              false,

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

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.os.Parcel;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -17,11 +16,7 @@ import org.thoughtcrime.securesms.database.AttachmentTable;
 public class TombstoneAttachment extends Attachment {
 
   public TombstoneAttachment(@NonNull String contentType, boolean quote) {
-    super(contentType, AttachmentTable.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, 0, quote, 0, null, null, null, null, null);
-  }
-
-  protected TombstoneAttachment(Parcel in) {
-    super(in);
+    super(contentType, AttachmentTable.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, quote, 0, null, null, null, null, null);
   }
 
   @Override

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

@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.os.Parcel;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.os.ParcelCompat;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
@@ -54,21 +52,10 @@ public class UriAttachment extends Attachment {
                        @Nullable AudioHash audioHash,
                        @Nullable TransformProperties transformProperties)
   {
-    super(contentType, transferState, size, fileName, 0, null, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, 0, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.dataUri = Objects.requireNonNull(dataUri);
   }
 
-  protected UriAttachment(Parcel in) {
-    super(in);
-    this.dataUri = Objects.requireNonNull(ParcelCompat.readParcelable(in, Uri.class.getClassLoader(), Uri.class));
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    super.writeToParcel(dest, flags);
-    dest.writeParcelable(dataUri, 0);
-  }
-
   @Override
   @NonNull
   public Uri getUri() {

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

@@ -2,19 +2,19 @@ package org.thoughtcrime.securesms.audio;
 
 import androidx.annotation.NonNull;
 
+import com.google.protobuf.ByteString;
+
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 
 import java.util.concurrent.TimeUnit;
 
-import okio.ByteString;
-
 public class AudioFileInfo {
   private final long    durationUs;
   private final byte[]  waveFormBytes;
   private final float[] waveForm;
 
   public static @NonNull AudioFileInfo fromDatabaseProtobuf(@NonNull AudioWaveFormData audioWaveForm) {
-    return new AudioFileInfo(audioWaveForm.durationUs, audioWaveForm.waveForm.toByteArray());
+    return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
   }
 
   AudioFileInfo(long durationUs, byte[] waveFormBytes) {
@@ -37,9 +37,9 @@ public class AudioFileInfo {
   }
 
   public @NonNull AudioWaveFormData toDatabaseProtobuf() {
-    return new AudioWaveFormData.Builder()
-                                .durationUs(durationUs)
-                                .waveForm(ByteString.of(waveFormBytes))
-                                .build();
+    return AudioWaveFormData.newBuilder()
+                            .setDurationUs(durationUs)
+                            .setWaveForm(ByteString.copyFrom(waveFormBytes))
+                            .build();
   }
 }

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

@@ -1,22 +1,17 @@
 package org.thoughtcrime.securesms.audio;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.thoughtcrime.securesms.util.ParcelUtil;
 import org.whispersystems.util.Base64;
 
 import java.io.IOException;
-import java.util.Objects;
 
 /**
  * An AudioHash is a compact string representation of the wave form and duration for an audio file.
  */
-public final class AudioHash implements Parcelable {
+public final class AudioHash {
 
   @NonNull private final String            hash;
   @NonNull private final AudioWaveFormData audioWaveForm;
@@ -27,46 +22,13 @@ public final class AudioHash implements Parcelable {
   }
 
   public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
-    this(Base64.encodeBytes(audioWaveForm.encode()), audioWaveForm);
+    this(Base64.encodeBytes(audioWaveForm.toByteArray()), audioWaveForm);
   }
 
-  protected AudioHash(Parcel in) {
-    hash = Objects.requireNonNull(in.readString());
-
-    try {
-      audioWaveForm = AudioWaveFormData.ADAPTER.decode(Objects.requireNonNull(ParcelUtil.readByteArray(in)));
-    } catch (IOException e) {
-      throw new AssertionError();
-    }
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(hash);
-    ParcelUtil.writeByteArray(dest, audioWaveForm.encode());
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  public static final Creator<AudioHash> CREATOR = new Creator<>() {
-    @Override
-    public AudioHash createFromParcel(Parcel in) {
-      return new AudioHash(in);
-    }
-
-    @Override
-    public AudioHash[] newArray(int size) {
-      return new AudioHash[size];
-    }
-  };
-
   public static @Nullable AudioHash parseOrNull(@Nullable String hash) {
     if (hash == null) return null;
     try {
-      return new AudioHash(hash, AudioWaveFormData.ADAPTER.decode(Base64.decode(hash)));
+      return new AudioHash(hash, AudioWaveFormData.parseFrom(Base64.decode(hash)));
     } catch (IOException e) {
       return null;
     }

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

@@ -107,7 +107,7 @@ object AudioWaveForms {
   private fun generateWaveForm(context: Context, uri: Uri, cacheKey: String, attachmentId: AttachmentId): CacheCheckResult {
     try {
       val startTime = System.currentTimeMillis()
-      SignalDatabase.attachments.writeAudioHash(attachmentId, AudioWaveFormData())
+      SignalDatabase.attachments.writeAudioHash(attachmentId, AudioWaveFormData.getDefaultInstance())
 
       Log.i(TAG, "Starting wave form generation ($cacheKey)")
       val fileInfo: AudioFileInfo = AudioWaveFormGenerator.generateWaveForm(context, uri)

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

@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.Conversions;
 import org.signal.core.util.StreamUtil;
-import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.kdf.HKDF;
 import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.backup.proto.BackupFrame;
@@ -28,9 +27,6 @@ import javax.crypto.spec.SecretKeySpec;
 
 class BackupRecordInputStream extends FullBackupBase.BackupStream {
 
-  private final String TAG             = Log.tag(BackupRecordInputStream.class);
-  private final int    MAX_BUFFER_SIZE = 8192;
-
   private final int         version;
   private final InputStream in;
   private final Cipher      cipher;
@@ -96,35 +92,6 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
     return readFrame(in);
   }
 
-  boolean validateFrame() throws InvalidAlgorithmParameterException, IOException, InvalidKeyException {
-    int frameLength = decryptFrameLength(in);
-    if (frameLength <= 0) {
-      Log.i(TAG, "Backup frame is not valid due to negative frame length. This is likely because the decryption passphrase was wrong.");
-      return false;
-    }
-
-    int    bufferSize = Math.min(MAX_BUFFER_SIZE, frameLength);
-    byte[] buffer     = new byte[bufferSize];
-    byte[] theirMac   = new byte[10];
-    while (frameLength > 0) {
-      int read = in.read(buffer, 0, Math.min(buffer.length, frameLength));
-      if (read == -1) return false;
-
-      if (read < MAX_BUFFER_SIZE) {
-        final int frameEndIndex = read - 10;
-        mac.update(buffer, 0, frameEndIndex);
-        System.arraycopy(buffer, frameEndIndex, theirMac, 0, theirMac.length);
-      } else {
-        mac.update(buffer, 0, read);
-      }
-      frameLength -= read;
-    }
-    
-    byte[] ourMac = ByteUtil.trim(mac.doFinal(), 10);
-
-    return MessageDigest.isEqual(ourMac, theirMac);
-  }
-
   void readAttachmentTo(OutputStream out, int length) throws IOException {
     try {
       Conversions.intToByteArray(iv, 0, counter++);
@@ -175,7 +142,24 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
 
   private BackupFrame readFrame(InputStream in) throws IOException {
     try {
-      int frameLength = decryptFrameLength(in);
+      byte[] length = new byte[4];
+      StreamUtil.readFully(in, length);
+
+      Conversions.intToByteArray(iv, 0, counter++);
+      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+
+      int frameLength;
+      if (BackupVersions.isFrameLengthEncrypted(version)) {
+        mac.update(length);
+        // this depends upon cipher being a stream cipher mode in order to get back the length without needing a full AES block-size input
+        byte[] decryptedLength = cipher.update(length);
+        if (decryptedLength.length != length.length) {
+          throw new IOException("Cipher was not a stream cipher!");
+        }
+        frameLength = Conversions.byteArrayToInt(decryptedLength);
+      } else {
+        frameLength = Conversions.byteArrayToInt(length);
+      }
 
       byte[] frame = new byte[frameLength];
       StreamUtil.readFully(in, frame);
@@ -198,27 +182,5 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
     }
   }
 
-  private int decryptFrameLength(InputStream inputStream) throws IOException, InvalidAlgorithmParameterException, InvalidKeyException {
-    byte[] length = new byte[4];
-    StreamUtil.readFully(inputStream, length);
-
-    Conversions.intToByteArray(iv, 0, counter++);
-    cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
-    int frameLength;
-    if (BackupVersions.isFrameLengthEncrypted(version)) {
-      mac.update(length);
-      // this depends upon cipher being a stream cipher mode in order to get back the length without needing a full AES block-size input
-      byte[] decryptedLength = cipher.update(length);
-      if (decryptedLength.length != length.length) {
-        throw new IOException("Cipher was not a stream cipher!");
-      }
-      frameLength = Conversions.byteArrayToInt(decryptedLength);
-    } else {
-      frameLength = Conversions.byteArrayToInt(length);
-    }
-    return frameLength;
-  }
-
   static class BadMacException extends IOException {}
 }

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

@@ -45,8 +45,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -65,24 +63,6 @@ public class FullBackupImporter extends FullBackupBase {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(FullBackupImporter.class);
 
-  public static boolean validatePassphrase(@NonNull Context context,
-                                           @NonNull Uri uri,
-                                           @NonNull String passphrase)
-      throws IOException
-  {
-
-    try (InputStream is = getInputStream(context, uri)) {
-      BackupRecordInputStream inputStream = new BackupRecordInputStream(is, passphrase);
-      return inputStream.validateFrame();
-    } catch (InvalidAlgorithmParameterException e) {
-      Log.w(TAG, "Invalid algorithm parameter exception in backup passphrase validation.", e);
-      return false;
-    } catch (InvalidKeyException e) {
-      Log.w(TAG, "Invalid key exception in backup passphrase validation.", e);
-      return false;
-    }
-  }
-
   public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                 @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)
       throws IOException

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

@@ -101,16 +101,16 @@ object Badges {
 
   @JvmStatic
   fun toDatabaseBadge(badge: Badge): BadgeList.Badge {
-    return BadgeList.Badge(
-      id = badge.id,
-      category = badge.category.code,
-      description = badge.description,
-      expiration = badge.expirationTimestamp,
-      visible = badge.visible,
-      name = badge.name,
-      imageUrl = badge.imageUrl.toString(),
-      imageDensity = badge.imageDensity
-    )
+    return BadgeList.Badge.newBuilder()
+      .setId(badge.id)
+      .setCategory(badge.category.code)
+      .setDescription(badge.description)
+      .setExpiration(badge.expirationTimestamp)
+      .setVisible(badge.visible)
+      .setName(badge.name)
+      .setImageUrl(badge.imageUrl.toString())
+      .setImageDensity(badge.imageDensity)
+      .build()
   }
 
   @JvmStatic

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

@@ -79,11 +79,12 @@ class GiftMessageView @JvmOverloads constructor(
       }
 
       actionView.setText(
-        when (giftBadge.redemptionState) {
+        when (giftBadge.redemptionState ?: GiftBadge.RedemptionState.UNRECOGNIZED) {
           GiftBadge.RedemptionState.PENDING -> R.string.GiftMessageView__redeem
           GiftBadge.RedemptionState.STARTED -> R.string.GiftMessageView__redeeming
           GiftBadge.RedemptionState.REDEEMED -> R.string.GiftMessageView__redeemed
           GiftBadge.RedemptionState.FAILED -> R.string.GiftMessageView__redeem
+          GiftBadge.RedemptionState.UNRECOGNIZED -> R.string.GiftMessageView__redeem
         }
       )
     }

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

@@ -32,7 +32,7 @@ object Gifts {
   ): OutgoingMessage {
     return OutgoingMessage(
       threadRecipient = recipient,
-      body = Base64.encodeBytes(giftBadge.encode()),
+      body = Base64.encodeBytes(giftBadge.toByteArray()),
       isSecure = true,
       sentTimeMillis = sentTimestamp,
       expiresIn = expiresIn,

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

@@ -83,7 +83,7 @@ class GiftFlowConfirmationFragment :
 
     keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
 
-    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, viewModel.uiSessionKey, DonationErrorSource.GIFT)
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, DonationErrorSource.GIFT)
 
     processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
       .setView(R.layout.processing_payment_dialog)
@@ -106,7 +106,6 @@ class GiftFlowConfirmationFragment :
         GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToGatewaySelectorBottomSheet(
           with(viewModel.snapshot) {
             GatewayRequest(
-              uiSessionKey = viewModel.uiSessionKey,
               donateToSignalType = DonateToSignalType.GIFT,
               badge = giftBadge!!,
               label = getString(R.string.preferences__one_time),
@@ -263,10 +262,6 @@ class GiftFlowConfirmationFragment :
     findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToCreditCardFragment(gatewayRequest))
   }
 
-  override fun navigateToBankTransferMandate(gatewayRequest: GatewayRequest) {
-    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToBankTransferMandateFragment(gatewayRequest))
-  }
-
   override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
     val mainActivityIntent = MainActivity.clearTop(requireContext())
 

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

@@ -39,7 +39,6 @@ class GiftFlowViewModel(
   val state: Flowable<GiftFlowState> = store.stateFlowable
   val events: Observable<DonationEvent> = eventPublisher
   val snapshot: GiftFlowState get() = store.state
-  val uiSessionKey: Long = System.currentTimeMillis()
 
   init {
     refresh()

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt

@@ -63,7 +63,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       ViewReceivedGiftBottomSheet().apply {
         arguments = Bundle().apply {
           putParcelable(ARG_SENT_FROM, messageRecord.fromRecipient.id)
-          putByteArray(ARG_GIFT_BADGE, messageRecord.giftBadge!!.encode())
+          putByteArray(ARG_GIFT_BADGE, messageRecord.giftBadge!!.toByteArray())
           putLong(ARG_MESSAGE_ID, messageRecord.id)
         }
         show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt

@@ -34,7 +34,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       ViewSentGiftBottomSheet().apply {
         arguments = Bundle().apply {
           putParcelable(ARG_SENT_TO, messageRecord.toRecipient.id)
-          putByteArray(ARG_GIFT_BADGE, messageRecord.giftBadge!!.encode())
+          putByteArray(ARG_GIFT_BADGE, messageRecord.giftBadge!!.toByteArray())
         }
         show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
       }
@@ -45,7 +45,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
     get() = requireArguments().getParcelableCompat(ARG_SENT_TO, RecipientId::class.java)!!
 
   private val giftBadge: GiftBadge
-    get() = GiftBadge.ADAPTER.decode(requireArguments().getByteArray(ARG_GIFT_BADGE)!!)
+    get() = GiftBadge.parseFrom(requireArguments().getByteArray(ARG_GIFT_BADGE))
 
   private val lifecycleDisposable = LifecycleDisposable()
 

app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinkJoinButton.kt

@@ -7,16 +7,12 @@ package org.thoughtcrime.securesms.calls.links
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.View
 import androidx.annotation.ColorRes
 import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.content.ContextCompat
 import com.google.android.material.button.MaterialButton
 import org.thoughtcrime.securesms.R
 
-/**
- * ConversationItem action button for joining a call link.
- */
 class CallLinkJoinButton @JvmOverloads constructor(
   context: Context,
   attrs: AttributeSet? = null
@@ -26,19 +22,10 @@ class CallLinkJoinButton @JvmOverloads constructor(
     inflate(context, R.layout.call_link_join_button, this)
   }
 
-  private val joinStroke: View = findViewById(R.id.join_stroke)
   private val joinButton: MaterialButton = findViewById(R.id.join_button)
 
   fun setTextColor(@ColorRes textColorResId: Int) {
-    val color = ContextCompat.getColor(context, textColorResId)
-
-    joinButton.setTextColor(color)
-  }
-
-  fun setStrokeColor(@ColorRes strokeColorResId: Int) {
-    val color = ContextCompat.getColor(context, strokeColorResId)
-
-    joinStroke.setBackgroundColor(color)
+    joinButton.setTextColor(ContextCompat.getColor(context, textColorResId))
   }
 
   fun setJoinClickListener(onClickListener: OnClickListener) {

app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt

@@ -59,6 +59,7 @@ object CallLinks {
     }
 
     if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) {
+      Log.w(TAG, "Invalid url prefix.")
       return false
     }
 

app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt

@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -133,10 +132,6 @@ fun SignalCallRow(
 
       Buttons.Small(
         onClick = onJoinClicked,
-        colors = ButtonDefaults.buttonColors(
-          containerColor = MaterialTheme.colorScheme.primaryContainer,
-          contentColor = MaterialTheme.colorScheme.onSurface
-        ),
         modifier = Modifier.align(CenterVertically)
       ) {
         Text(text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__join))

app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt

@@ -106,13 +106,7 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
       Spacer(modifier = Modifier.height(12.dp))
 
       Rows.TextRow(
-        text = stringResource(
-          id = if (callLink.state.name.isEmpty()) {
-            R.string.CreateCallLinkBottomSheetDialogFragment__add_call_name
-          } else {
-            R.string.CreateCallLinkBottomSheetDialogFragment__edit_call_name
-          }
-        ),
+        text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__add_call_name),
         onClick = this@CreateCallLinkBottomSheetDialogFragment::onAddACallNameClicked
       )
 

app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt

@@ -246,13 +246,7 @@ private fun CallLinkDetails(
 
       if (state.callLink.credentials?.adminPassBytes != null) {
         Rows.TextRow(
-          text = stringResource(
-            id = if (state.callLink.state.name.isEmpty()) {
-              R.string.CreateCallLinkBottomSheetDialogFragment__add_call_name
-            } else {
-              R.string.CreateCallLinkBottomSheetDialogFragment__edit_call_name
-            }
-          ),
+          text = stringResource(id = R.string.CallLinkDetailsFragment__add_call_name),
           onClick = callback::onEditNameClicked
         )
 

app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt

@@ -17,7 +17,6 @@ import androidx.core.app.SharedElementCallback
 import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionInflater
@@ -58,7 +57,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTab
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.doAfterNextLayout
 import org.thoughtcrime.securesms.util.fragments.requireListener
@@ -76,7 +74,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     private val TAG = Log.tag(CallLogFragment::class.java)
   }
 
-  private val viewModel: CallLogViewModel by activityViewModels()
+  private val viewModel: CallLogViewModel by viewModels()
   private val binding: CallLogFragmentBinding by ViewBinderDelegate(CallLogFragmentBinding::bind)
   private val disposables = LifecycleDisposable()
   private val callLogContextMenu = CallLogContextMenu(this, this)
@@ -232,13 +230,6 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     val count = callLogActionMode.getCount()
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, count, count))
-      .setMessage(
-        if (FeatureFlags.adHocCalling()) {
-          getString(R.string.CallLogFragment__call_links_youve_created)
-        } else {
-          null
-        }
-      )
       .setPositiveButton(R.string.CallLogFragment__delete) { _, _ ->
         performDeletion(count, viewModel.stageSelectionDeletion())
         callLogActionMode.end()
@@ -312,12 +303,6 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
       val progress = 1 - verticalOffset.toFloat() / -layout.height
       binding.pullView.onUserDrag(progress)
     }
-
-    if (viewModel.filterSnapshot != CallLogFilter.ALL) {
-      binding.root.doAfterNextLayout {
-        binding.pullView.openImmediate()
-      }
-    }
   }
 
   override fun onCreateACallLinkClicked() {
@@ -378,13 +363,6 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
   override fun deleteCall(call: CallLogRow) {
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, 1, 1))
-      .setMessage(
-        if (FeatureFlags.adHocCalling()) {
-          getString(R.string.CallLogFragment__call_links_youve_created)
-        } else {
-          null
-        }
-      )
       .setPositiveButton(R.string.CallLogFragment__delete) { _, _ ->
         performDeletion(1, viewModel.stageCallDeletion(call))
       }

app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt

@@ -63,7 +63,7 @@ class CallLogPagedDataSource(
       remaining -= callEvents.size
     }
 
-    if (hasFilter && start <= clearFilterStart && remaining > 0) {
+    if (start <= clearFilterStart && remaining > 0) {
       callLogRows.add(CallLogRow.ClearFilter)
     }
 

app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRepository.kt

@@ -86,22 +86,18 @@ class CallLogRepository(
   /**
    * Delete all call events / unowned links and enqueue clear history job, and then
    * emit a clear history message.
-   *
-   * This explicitly drops failed call link revocations of call links, and those call links
-   * will remain visible to the user. This is safe because the clear history sync message should
-   * only clear local history and then poll link status from the server.
    */
   fun deleteAllCallLogsOnOrBeforeNow(): Single<Int> {
     return Single.fromCallable {
       SignalDatabase.rawDatabase.withinTransaction {
-        val latestTimestamp = SignalDatabase.calls.getLatestTimestamp()
-        SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(latestTimestamp)
-        SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(latestTimestamp)
-        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forClearHistory(latestTimestamp))
+        val now = System.currentTimeMillis()
+        SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(now)
+        SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(now)
+        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forClearHistory(now))
       }
 
       SignalDatabase.callLinks.getAllAdminCallLinksExcept(emptySet())
-    }.flatMap(this::revokeAndCollectResults).map { 0 }.subscribeOn(Schedulers.io())
+    }.flatMap(this::revokeAndCollectResults).map { -1 }.subscribeOn(Schedulers.io())
   }
 
   /**

app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRow.kt

@@ -93,11 +93,11 @@ sealed class CallLogRow {
           return FULL
         }
 
-        if (groupCallUpdateDetails.inCallUuids.contains(Recipient.self().requireAci().rawUuid.toString())) {
+        if (groupCallUpdateDetails.inCallUuidsList.contains(Recipient.self().requireAci().rawUuid.toString())) {
           return LOCAL_USER_JOINED
         }
 
-        return if (groupCallUpdateDetails.inCallUuids.isNotEmpty()) {
+        return if (groupCallUpdateDetails.inCallUuidsCount > 0) {
           ACTIVE
         } else {
           NONE

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

@@ -1,8 +1,3 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
@@ -17,12 +12,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.transfercontrols.TransferControlView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
 
 import java.util.List;
@@ -31,15 +24,13 @@ public class AlbumThumbnailView extends FrameLayout {
 
   private @Nullable SlideClickListener    thumbnailClickListener;
   private @Nullable SlidesClickedListener downloadClickListener;
-  private @Nullable SlidesClickedListener cancelDownloadClickListener;
-  private @Nullable SlideClickListener playVideoClickListener;
 
   private int currentSizeClass;
 
   private final int[] corners = new int[4];
 
-  private final ViewGroup                 albumCellContainer;
-  private final Stub<TransferControlView> transferControlsStub;
+  private ViewGroup                 albumCellContainer;
+  private Stub<TransferControlView> transferControls;
 
   private final SlideClickListener defaultThumbnailClickListener = (v, slide) -> {
     if (thumbnailClickListener != null) {
@@ -51,18 +42,19 @@ public class AlbumThumbnailView extends FrameLayout {
 
   public AlbumThumbnailView(@NonNull Context context) {
     super(context);
-    inflate(getContext(), R.layout.album_thumbnail_view, this);
-
-    albumCellContainer    = findViewById(R.id.album_cell_container);
-    transferControlsStub  = new Stub<>(findViewById(R.id.album_transfer_controls_stub));
+    initialize();
   }
 
   public AlbumThumbnailView(@NonNull Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
+    initialize();
+  }
+
+  private void initialize() {
     inflate(getContext(), R.layout.album_thumbnail_view, this);
 
-    albumCellContainer    = findViewById(R.id.album_cell_container);
-    transferControlsStub  = new Stub<>(findViewById(R.id.album_transfer_controls_stub));
+    albumCellContainer = findViewById(R.id.album_cell_container);
+    transferControls   = new Stub<>(findViewById(R.id.album_transfer_controls_stub));
   }
 
   public void setSlides(@NonNull GlideRequests glideRequests, @NonNull List<Slide> slides, boolean showControls) {
@@ -71,17 +63,16 @@ public class AlbumThumbnailView extends FrameLayout {
     }
 
     if (showControls) {
-      transferControlsStub.get().setShowSecondaryText(true);
-      transferControlsStub.get().setDownloadClickListener(
-          v -> {
-            if (downloadClickListener != null) {
-              downloadClickListener.onClick(v, slides);
-            }
-          });
-      transferControlsStub.get().setSlides(slides);
+      transferControls.get().setShowDownloadText(true);
+      transferControls.get().setSlides(slides);
+      transferControls.get().setDownloadClickListener(v -> {
+        if (downloadClickListener != null) {
+          downloadClickListener.onClick(v, slides);
+        }
+      });
     } else {
-      if (transferControlsStub.resolved()) {
-        transferControlsStub.get().setVisibility(GONE);
+      if (transferControls.resolved()) {
+        transferControls.get().setVisibility(GONE);
       }
     }
 
@@ -94,7 +85,6 @@ public class AlbumThumbnailView extends FrameLayout {
 
     showSlides(glideRequests, slides);
     applyCorners();
-    forceLayout();
   }
 
   public void setCellBackgroundColor(@ColorInt int color) {
@@ -111,19 +101,10 @@ public class AlbumThumbnailView extends FrameLayout {
     thumbnailClickListener = listener;
   }
 
-  public void setDownloadClickListener(SlidesClickedListener listener) {
-    this.downloadClickListener = listener;
+  public void setDownloadClickListener(@Nullable SlidesClickedListener listener) {
+    downloadClickListener = listener;
   }
 
-  public void setCancelDownloadClickListener(SlidesClickedListener listener) {
-    this.cancelDownloadClickListener = listener;
-  }
-
-  public void setPlayVideoClickListener(SlideClickListener listener) {
-    this.playVideoClickListener = listener;
-  }
-
-
   public void setRadii(int topLeft, int topRight, int bottomRight, int bottomLeft) {
     corners[0] = topLeft;
     corners[1] = topRight;
@@ -136,46 +117,23 @@ public class AlbumThumbnailView extends FrameLayout {
   private void inflateLayout(int sizeClass) {
     albumCellContainer.removeAllViews();
 
-    int resId;
     switch (sizeClass) {
       case 2:
-        resId = R.layout.album_thumbnail_2;
+        inflate(getContext(), R.layout.album_thumbnail_2, albumCellContainer);
         break;
       case 3:
-        resId = R.layout.album_thumbnail_3;
+        inflate(getContext(), R.layout.album_thumbnail_3, albumCellContainer);
         break;
       case 4:
-        resId = R.layout.album_thumbnail_4;
+        inflate(getContext(), R.layout.album_thumbnail_4, albumCellContainer);
         break;
       case 5:
-        resId = R.layout.album_thumbnail_5;
+        inflate(getContext(), R.layout.album_thumbnail_5, albumCellContainer);
         break;
       default:
-        resId = R.layout.album_thumbnail_many;
+        inflate(getContext(), R.layout.album_thumbnail_many, albumCellContainer);
         break;
     }
-
-    inflate(getContext(), resId, albumCellContainer);
-    if (transferControlsStub.resolved()) {
-      int size;
-      switch (sizeClass) {
-        case 2:
-          size = R.dimen.album_2_total_height;
-          break;
-        case 3:
-          size = R.dimen.album_3_total_height;
-          break;
-        case 4:
-          size = R.dimen.album_4_total_height;
-          break;
-        default:
-          size = R.dimen.album_5_total_height;
-          break;
-      }
-      ViewGroup.LayoutParams params = transferControlsStub.get().getLayoutParams();
-      params.height = getContext().getResources().getDimensionPixelSize(size);
-      transferControlsStub.get().setLayoutParams(params);
-    }
   }
 
   private void applyCorners() {
@@ -256,20 +214,19 @@ public class AlbumThumbnailView extends FrameLayout {
   }
 
   private void showSlides(@NonNull GlideRequests glideRequests, @NonNull List<Slide> slides) {
-    boolean showControls = TransferControlView.containsPlayableSlides(slides);
-    setSlide(glideRequests, slides.get(0), R.id.album_cell_1, showControls);
-    setSlide(glideRequests, slides.get(1), R.id.album_cell_2, showControls);
+    setSlide(glideRequests, slides.get(0), R.id.album_cell_1);
+    setSlide(glideRequests, slides.get(1), R.id.album_cell_2);
 
     if (slides.size() >= 3) {
-      setSlide(glideRequests, slides.get(2), R.id.album_cell_3, showControls);
+      setSlide(glideRequests, slides.get(2), R.id.album_cell_3);
     }
 
     if (slides.size() >= 4) {
-      setSlide(glideRequests, slides.get(3), R.id.album_cell_4, showControls);
+      setSlide(glideRequests, slides.get(3), R.id.album_cell_4);
     }
 
     if (slides.size() >= 5) {
-      setSlide(glideRequests, slides.get(4), R.id.album_cell_5, showControls && slides.size() == 5);
+      setSlide(glideRequests, slides.get(4), R.id.album_cell_5);
     }
 
     if (slides.size() > 5) {
@@ -278,17 +235,11 @@ public class AlbumThumbnailView extends FrameLayout {
     }
   }
 
-  private void setSlide(@NonNull GlideRequests glideRequests, @NonNull Slide slide, @IdRes int id, boolean showControls) {
+  private void setSlide(@NonNull GlideRequests glideRequests, @NonNull Slide slide, @IdRes int id) {
     ThumbnailView cell = findViewById(id);
-    cell.showSecondaryText(false);
+    cell.setImageResource(glideRequests, slide, false, false);
     cell.setThumbnailClickListener(defaultThumbnailClickListener);
-    cell.setDownloadClickListener(downloadClickListener);
-    cell.setCancelDownloadClickListener(cancelDownloadClickListener);
-    if (MediaUtil.isInstantVideoSupported(slide)) {
-      cell.setPlayVideoClickListener(playVideoClickListener);
-    }
     cell.setOnLongClickListener(defaultLongClickListener);
-    cell.setImageResource(glideRequests, slide, showControls, false);
   }
 
   private int sizeClass(int size) {

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

@@ -15,16 +15,12 @@ import androidx.annotation.Px;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.FragmentActivity;
 
-import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.MultiTransformation;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy;
-import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 
 import org.signal.core.util.logging.Log;
@@ -36,7 +32,6 @@ import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.conversation.colors.ChatColors;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -59,8 +54,6 @@ public final class AvatarImageView extends AppCompatImageView {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(AvatarImageView.class);
 
-  private final RequestListener<Drawable> redownloadRequestListener = new RedownloadRequestListener();
-
   private int                             size;
   private boolean                         inverted;
   private OnClickListener                 listener;
@@ -205,8 +198,7 @@ public final class AvatarImageView extends AppCompatImageView {
                                                          .error(fallbackContactPhotoDrawable)
                                                          .diskCacheStrategy(DiskCacheStrategy.ALL)
                                                          .downsample(DownsampleStrategy.CENTER_INSIDE)
-                                                         .transform(new MultiTransformation<>(transforms))
-                                                         .addListener(redownloadRequestListener);
+                                                         .transform(new MultiTransformation<>(transforms));
 
           if (avatarOptions.fixedSize > 0) {
             fixedSizeTarget = new FixedSizeTarget(avatarOptions.fixedSize);
@@ -371,19 +363,4 @@ public final class AvatarImageView extends AppCompatImageView {
       }
     }
   }
-
-  private static class RedownloadRequestListener implements RequestListener<Drawable> {
-    @Override
-    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-      if (model instanceof ProfileContactPhoto) {
-        RetrieveProfileAvatarJob.enqueueForceUpdate(((ProfileContactPhoto) model).getRecipient());
-      }
-      return false;
-    }
-
-    @Override
-    public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-      return false;
-    }
-  }
 }

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

@@ -322,12 +322,12 @@ public class ConversationItemFooter extends ConstraintLayout {
     } else {
       long timestamp = messageRecord.getTimestamp();
       if (messageRecord.isEditMessage()) {
-        if (displayMode == ConversationItemDisplayMode.EditHistory.INSTANCE) {
+        if (displayMode == ConversationItemDisplayMode.EDIT_HISTORY) {
           timestamp = messageRecord.getDateSent();
         }
       }
       String date = DateUtils.getDatelessRelativeTimeSpanString(getContext(), locale, timestamp);
-      if (displayMode != ConversationItemDisplayMode.Detailed.INSTANCE && messageRecord.isEditMessage() && messageRecord.isLatestRevision()) {
+      if (displayMode != ConversationItemDisplayMode.DETAILED && messageRecord.isEditMessage() && messageRecord.isLatestRevision()) {
         date = getContext().getString(R.string.ConversationItem_edited_timestamp_footer, date);
       }
       dateView.setText(date);

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

@@ -1,8 +1,3 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.components
 
 import android.content.Context
@@ -91,7 +86,7 @@ class ConversationItemThumbnail @JvmOverloads constructor(
     }
   }
 
-  override fun onSaveInstanceState(): Parcelable {
+  override fun onSaveInstanceState(): Parcelable? {
     val root = super.onSaveInstanceState()
     return bundleOf(
       STATE_ROOT to root,
@@ -260,19 +255,9 @@ class ConversationItemThumbnail @JvmOverloads constructor(
     state.applyState(thumbnail, album)
   }
 
-  fun setPlayVideoClickListener(listener: SlideClickListener?) {
+  fun setProgressWheelClickListener(listener: SlideClickListener?) {
     state = state.copy(
-      thumbnailViewState = state.thumbnailViewState.copy(playVideoClickListener = listener),
-      albumViewState = state.albumViewState.copy(playVideoClickListener = listener)
-    )
-
-    state.applyState(thumbnail, album)
-  }
-
-  fun setCancelDownloadClickListener(listener: SlidesClickedListener?) {
-    state = state.copy(
-      thumbnailViewState = state.thumbnailViewState.copy(cancelDownloadClickListener = listener),
-      albumViewState = state.albumViewState.copy(cancelDownloadClickListener = listener)
+      thumbnailViewState = state.thumbnailViewState.copy(progressWheelClickListener = listener)
     )
 
     state.applyState(thumbnail, album)

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

@@ -1,8 +1,3 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.components
 
 import android.graphics.Color
@@ -36,9 +31,7 @@ data class ConversationItemThumbnailState(
     @IgnoredOnParcel
     private val downloadClickListener: SlidesClickedListener? = null,
     @IgnoredOnParcel
-    private val cancelDownloadClickListener: SlidesClickedListener? = null,
-    @IgnoredOnParcel
-    private val playVideoClickListener: SlideClickListener? = null,
+    private val progressWheelClickListener: SlideClickListener? = null,
     @IgnoredOnParcel
     private val longClickListener: OnLongClickListener? = null,
     private val visibility: Int = View.GONE,
@@ -64,8 +57,7 @@ data class ConversationItemThumbnailState(
       thumbnailView.get().setRadii(cornerTopLeft, cornerTopRight, cornerBottomRight, cornerBottomLeft)
       thumbnailView.get().setThumbnailClickListener(clickListener)
       thumbnailView.get().setDownloadClickListener(downloadClickListener)
-      thumbnailView.get().setCancelDownloadClickListener(cancelDownloadClickListener)
-      thumbnailView.get().setPlayVideoClickListener(playVideoClickListener)
+      thumbnailView.get().setProgressWheelClickListener(progressWheelClickListener)
       thumbnailView.get().setOnLongClickListener(longClickListener)
       thumbnailView.get().setBounds(minWidth, maxWidth, minHeight, maxHeight)
     }
@@ -80,10 +72,6 @@ data class ConversationItemThumbnailState(
     @IgnoredOnParcel
     private val downloadClickListener: SlidesClickedListener? = null,
     @IgnoredOnParcel
-    private val cancelDownloadClickListener: SlidesClickedListener? = null,
-    @IgnoredOnParcel
-    private val playVideoClickListener: SlideClickListener? = null,
-    @IgnoredOnParcel
     private val longClickListener: OnLongClickListener? = null,
     private val visibility: Int = View.GONE,
     private val cellBackgroundColor: Int = Color.TRANSPARENT,
@@ -104,8 +92,6 @@ data class ConversationItemThumbnailState(
       albumView.get().setRadii(cornerTopLeft, cornerTopRight, cornerBottomRight, cornerBottomLeft)
       albumView.get().setThumbnailClickListener(clickListener)
       albumView.get().setDownloadClickListener(downloadClickListener)
-      albumView.get().setCancelDownloadClickListener(cancelDownloadClickListener)
-      albumView.get().setPlayVideoClickListener(playVideoClickListener)
       albumView.get().setOnLongClickListener(longClickListener)
       albumView.get().setCellBackgroundColor(cellBackgroundColor)
     }

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

@@ -5,20 +5,19 @@
 
 package org.thoughtcrime.securesms.components
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.ViewModelProvider
 import org.signal.core.util.ResourceUtil
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.PromptLogsBottomSheetBinding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
@@ -28,25 +27,14 @@ import org.thoughtcrime.securesms.util.SupportEmailUtil
 class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
 
   companion object {
-    private const val KEY_PURPOSE = "purpose"
 
     @JvmStatic
-    fun show(activity: AppCompatActivity, purpose: Purpose) {
-      if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
-        return
-      }
-
-      if (NetworkUtil.isConnected(activity) && activity.supportFragmentManager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) == null) {
+    fun show(context: Context, fragmentManager: FragmentManager) {
+      if (NetworkUtil.isConnected(context) && fragmentManager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) == null) {
         DebugLogsPromptDialogFragment().apply {
-          arguments = bundleOf(
-            KEY_PURPOSE to purpose.serialized
-          )
-        }.show(activity.supportFragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
-
-        when (purpose) {
-          Purpose.NOTIFICATIONS -> SignalStore.uiHints().lastNotificationLogsPrompt = System.currentTimeMillis()
-          Purpose.CRASH -> SignalStore.uiHints().lastCrashPrompt = System.currentTimeMillis()
-        }
+          arguments = bundleOf()
+        }.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+        SignalStore.uiHints().lastNotificationLogsPrompt = System.currentTimeMillis()
       }
     }
   }
@@ -56,12 +44,7 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
 
   private val binding by ViewBinderDelegate(PromptLogsBottomSheetBinding::bind)
 
-  private val viewModel: PromptLogsViewModel by viewModels(
-    factoryProducer = {
-      val purpose = Purpose.deserialize(requireArguments().getInt(KEY_PURPOSE))
-      PromptLogsViewModel.Factory(ApplicationDependencies.getApplication(), purpose)
-    }
-  )
+  private lateinit var viewModel: PromptLogsViewModel
 
   private val disposables: LifecycleDisposable = LifecycleDisposable()
 
@@ -72,21 +55,11 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     disposables.bindTo(viewLifecycleOwner)
 
-    val purpose = Purpose.deserialize(requireArguments().getInt(KEY_PURPOSE))
-
-    when (purpose) {
-      Purpose.NOTIFICATIONS -> {
-        binding.title.setText(R.string.PromptLogsSlowNotificationsDialog__title)
-      }
-      Purpose.CRASH -> {
-        binding.title.setText(R.string.PromptLogsSlowNotificationsDialog__title_crash)
-      }
-    }
-
+    viewModel = ViewModelProvider(this).get(PromptLogsViewModel::class.java)
     binding.submit.setOnClickListener {
       val progressDialog = SignalProgressDialog.show(requireContext())
       disposables += viewModel.submitLogs().subscribe({ result ->
-        submitLogs(result, purpose)
+        submitLogs(result)
         progressDialog.dismiss()
         dismiss()
       }, { _ ->
@@ -95,40 +68,30 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
         dismiss()
       })
     }
-
     binding.decline.setOnClickListener {
-      if (purpose == Purpose.NOTIFICATIONS) {
-        SignalStore.uiHints().markDeclinedShareNotificationLogs()
-      }
-
+      SignalStore.uiHints().markDeclinedShareNotificationLogs()
       dismiss()
     }
   }
 
-  private fun submitLogs(debugLog: String, purpose: Purpose) {
+  private fun submitLogs(debugLog: String) {
     CommunicationActions.openEmail(
       requireContext(),
       SupportEmailUtil.getSupportEmailAddress(requireContext()),
       getString(R.string.DebugLogsPromptDialogFragment__signal_android_support_request),
-      getEmailBody(debugLog, purpose)
+      getEmailBody(debugLog)
     )
   }
 
-  private fun getEmailBody(debugLog: String?, purpose: Purpose): String {
+  private fun getEmailBody(debugLog: String?): String {
     val suffix = StringBuilder()
-
     if (debugLog != null) {
       suffix.append("\n")
       suffix.append(getString(R.string.HelpFragment__debug_log))
       suffix.append(" ")
       suffix.append(debugLog)
     }
-
-    val category = when (purpose) {
-      Purpose.NOTIFICATIONS -> ResourceUtil.getEnglishResources(requireContext()).getString(R.string.DebugLogsPromptDialogFragment__slow_notifications_category)
-      Purpose.CRASH -> ResourceUtil.getEnglishResources(requireContext()).getString(R.string.DebugLogsPromptDialogFragment__crash_category)
-    }
-
+    val category = ResourceUtil.getEnglishResources(requireContext()).getString(R.string.DebugLogsPromptDialogFragment__slow_notifications_category)
     return SupportEmailUtil.generateSupportEmailBody(
       requireContext(),
       R.string.DebugLogsPromptDialogFragment__signal_android_support_request,
@@ -137,21 +100,4 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
       suffix.toString()
     )
   }
-
-  enum class Purpose(val serialized: Int) {
-
-    NOTIFICATIONS(1), CRASH(2);
-
-    companion object {
-      fun deserialize(serialized: Int): Purpose {
-        for (value in values()) {
-          if (value.serialized == serialized) {
-            return value
-          }
-        }
-
-        throw IllegalArgumentException("Invalid value: $serialized")
-      }
-    }
-  }
 }

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

@@ -5,11 +5,13 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.text.SpannableStringBuilder;
+import android.text.style.CharacterStyle;
 import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import org.signal.core.util.BreakIteratorCompat;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView;
@@ -18,6 +20,7 @@ import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import java.util.Iterator;
 import java.util.Objects;
 
 public class FromTextView extends SimpleEmojiTextView {

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

@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * LinearLayout that, when a view container, will report back when it thinks a soft keyboard

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

@@ -163,10 +163,10 @@ public class LinkPreviewView extends FrameLayout {
   }
 
   public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail) {
-    setLinkPreview(glideRequests, linkPreview, showThumbnail, true, false);
+    setLinkPreview(glideRequests, linkPreview, showThumbnail, true);
   }
 
-  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail, boolean showDescription, boolean scheduleMessageMode) {
+  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail, boolean showDescription) {
     spinner.setVisibility(GONE);
     noPreview.setVisibility(GONE);
 
@@ -216,8 +216,8 @@ public class LinkPreviewView extends FrameLayout {
     if (showThumbnail && linkPreview.getThumbnail().isPresent()) {
       thumbnail.setVisibility(VISIBLE);
       thumbnailState.applyState(thumbnail);
-      thumbnail.get().setImageResource(glideRequests, new ImageSlide(linkPreview.getThumbnail().get()), type == TYPE_CONVERSATION && !scheduleMessageMode, false);
-      thumbnail.get().showSecondaryText(false);
+      thumbnail.get().setImageResource(glideRequests, new ImageSlide(linkPreview.getThumbnail().get()), type == TYPE_CONVERSATION, false);
+      thumbnail.get().showDownloadText(false);
     } else if (callLinkRootKey != null) {
       thumbnail.setVisibility(VISIBLE);
       thumbnailState.applyState(thumbnail);
@@ -228,7 +228,7 @@ public class LinkPreviewView extends FrameLayout {
                    .asDrawable(getContext(),
                                AvatarColorHash.forCallLink(callLinkRootKey.getKeyBytes()))
       );
-      thumbnail.get().showSecondaryText(false);
+      thumbnail.get().showDownloadText(false);
     } else {
       thumbnail.setVisibility(GONE);
     }

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

@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.ViewModelProvider
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.PromptBatterySaverBottomSheetBinding
@@ -40,6 +41,8 @@ class PromptBatterySaverDialogFragment : FixedRoundedCornerBottomSheetDialogFrag
 
   private val binding by ViewBinderDelegate(PromptBatterySaverBottomSheetBinding::bind)
 
+  private lateinit var viewModel: PromptLogsViewModel
+
   private val disposables: LifecycleDisposable = LifecycleDisposable()
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -49,6 +52,7 @@ class PromptBatterySaverDialogFragment : FixedRoundedCornerBottomSheetDialogFrag
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     disposables.bindTo(viewLifecycleOwner)
 
+    viewModel = ViewModelProvider(this)[PromptLogsViewModel::class.java]
     binding.continueButton.setOnClickListener {
       PowerManagerCompat.requestIgnoreBatteryOptimizations(requireContext())
     }

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

@@ -5,37 +5,17 @@
 
 package org.thoughtcrime.securesms.components
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.reactivex.rxjava3.subjects.SingleSubject
-import org.thoughtcrime.securesms.crash.CrashConfig
-import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository
 
-class PromptLogsViewModel(private val context: Application, purpose: DebugLogsPromptDialogFragment.Purpose) : AndroidViewModel(context) {
+class PromptLogsViewModel : ViewModel() {
 
   private val submitDebugLogRepository = SubmitDebugLogRepository()
 
-  private val disposables = CompositeDisposable()
-
-  init {
-    if (purpose == DebugLogsPromptDialogFragment.Purpose.CRASH) {
-      disposables += Single
-        .fromCallable {
-          LogDatabase.getInstance(context).crashes.markAsPrompted(CrashConfig.patterns, System.currentTimeMillis())
-        }
-        .subscribeOn(Schedulers.io())
-        .subscribe()
-    }
-  }
-
   fun submitLogs(): Single<String> {
     val singleSubject = SingleSubject.create<String?>()
     submitDebugLogRepository.buildAndSubmitLog { result ->
@@ -48,14 +28,4 @@ class PromptLogsViewModel(private val context: Application, purpose: DebugLogsPr
 
     return singleSubject.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
   }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  class Factory(private val context: Application, private val purpose: DebugLogsPromptDialogFragment.Purpose) : ViewModelProvider.NewInstanceFactory() {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return modelClass.cast(PromptLogsViewModel(context, purpose))!!
-    }
-  }
 }

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

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
 
+import android.annotation.TargetApi;
 import android.content.ContentUris;
 import android.content.Context;
 import android.database.Cursor;

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

@@ -1,65 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.components
-
-import android.animation.LayoutTransition
-import android.view.View
-import android.view.View.OnAttachStateChangeListener
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-
-/**
- * Helps manage layout transition state inside a RecyclerView.
- *
- * Because of how RecyclerViews scroll, we need to be very careful about LayoutTransition
- * usage inside of them. This class helps wrap up the pattern of finding and listening to
- * the scroll events of a parent recycler view, so that we don't need to manually wire
- * the scroll state in everywhere.
- */
-class RecyclerViewParentTransitionController(
-  private val child: ViewGroup,
-  private val transition: LayoutTransition = LayoutTransition()
-) : RecyclerView.OnScrollListener(), OnAttachStateChangeListener {
-
-  private var recyclerViewParent: RecyclerView? = null
-
-  override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-    if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-      child.layoutTransition = transition
-    } else {
-      child.layoutTransition = null
-    }
-  }
-
-  override fun onViewAttachedToWindow(v: View) {
-    val parent = findRecyclerParent()
-
-    if (parent != null) {
-      onScrollStateChanged(parent, parent.scrollState)
-    }
-
-    parent?.addOnScrollListener(this)
-    recyclerViewParent = parent
-  }
-
-  override fun onViewDetachedFromWindow(v: View) {
-    recyclerViewParent?.removeOnScrollListener(this)
-    child.layoutTransition = null
-  }
-
-  private fun findRecyclerParent(): RecyclerView? {
-    var target: ViewGroup? = child.parent as? ViewGroup
-    while (target != null) {
-      if (target is RecyclerView) {
-        return target
-      }
-
-      target = target.parent as? ViewGroup
-    }
-
-    return null
-  }
-}

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

@@ -1,8 +1,3 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
@@ -36,7 +31,6 @@ import org.signal.core.util.logging.Log;
 import org.signal.glide.transforms.SignalDownsampleStrategy;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.components.transfercontrols.TransferControlView;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequest;
@@ -47,6 +41,7 @@ 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.FeatureFlags;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -55,7 +50,6 @@ import org.thoughtcrime.securesms.util.views.Stub;
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
@@ -86,12 +80,12 @@ public class ThumbnailView extends FrameLayout {
 
   private final CornerMask cornerMask;
 
-  private final Stub<TransferControlView>          transferControlViewStub;
-  private       SlideClickListener                 thumbnailClickListener      = null;
-  private       SlidesClickedListener              downloadClickListener       = null;
-  private       SlidesClickedListener              cancelDownloadClickListener = null;
-  private       SlideClickListener                 playVideoClickListener      = null;
-  private       Slide                              slide                       = null;
+  private ThumbnailViewTransferControlsState transferControlsState      = new ThumbnailViewTransferControlsState();
+  private Stub<TransferControlView>          transferControlViewStub;
+  private SlideClickListener                 thumbnailClickListener     = null;
+  private SlidesClickedListener              downloadClickListener      = null;
+  private SlideClickListener                 progressWheelClickListener = null;
+  private Slide                              slide                      = null;
 
 
   public ThumbnailView(Context context) {
@@ -284,13 +278,15 @@ public class ThumbnailView extends FrameLayout {
   @Override
   public void setFocusable(boolean focusable) {
     super.setFocusable(focusable);
-    transferControlViewStub.get().setFocusable(focusable);
+    transferControlsState = transferControlsState.withFocusable(focusable);
+    transferControlsState.applyState(transferControlViewStub);
   }
 
   @Override
   public void setClickable(boolean clickable) {
     super.setClickable(clickable);
-    transferControlViewStub.get().setClickable(clickable);
+    transferControlsState = transferControlsState.withClickable(clickable);
+    transferControlsState.applyState(transferControlViewStub);
   }
 
   public @Nullable Drawable getImageDrawable() {
@@ -363,15 +359,24 @@ public class ThumbnailView extends FrameLayout {
     }
 
     if (showControls) {
-      transferControlViewStub.get().setDownloadClickListener(new DownloadClickDispatcher());
-      transferControlViewStub.get().setCancelClickListener(new CancelClickDispatcher());
-      if (MediaUtil.isInstantVideoSupported(slide)) {
-        transferControlViewStub.get().setInstantPlaybackClickListener(new InstantVideoClickDispatcher());
+      int transferState = TransferControlView.getTransferState(Collections.singletonList(slide));
+      if (transferState == AttachmentTable.TRANSFER_PROGRESS_DONE || transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE) {
+        transferControlViewStub.setVisibility(View.GONE);
+      } else {
+        transferControlViewStub.setVisibility(View.VISIBLE);
       }
-      transferControlViewStub.get().setSlides(List.of(slide));
+
+      transferControlsState = transferControlsState.withSlide(slide)
+                                                   .withDownloadClickListener(new DownloadClickDispatcher());
+
+      if (FeatureFlags.instantVideoPlayback()) {
+        transferControlsState = transferControlsState.withProgressWheelClickListener(new ProgressWheelClickDispatcher());
+      }
+
+      transferControlsState.applyState(transferControlViewStub);
+    } else {
+      transferControlViewStub.setVisibility(View.GONE);
     }
-    int transferState = TransferControlView.getTransferState(List.of(slide));
-    transferControlViewStub.get().setVisible(showControls && transferState != AttachmentTable.TRANSFER_PROGRESS_DONE && transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE);
 
     if (slide.getUri() != null && slide.hasPlayOverlay() &&
         (slide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_DONE || isPreview))
@@ -520,41 +525,8 @@ public class ThumbnailView extends FrameLayout {
     this.downloadClickListener = listener;
   }
 
-  public void setCancelDownloadClickListener(SlidesClickedListener listener) {
-    this.cancelDownloadClickListener = listener;
-  }
-
-  public void setPlayVideoClickListener(SlideClickListener listener) {
-    this.playVideoClickListener = listener;
-  }
-
-  private static boolean hasSameContents(@Nullable Slide slide, @Nullable Slide other) {
-    if (Util.equals(slide, other)) {
-
-      if (slide != null && other != null) {
-        byte[] digestLeft  = slide.asAttachment().getDigest();
-        byte[] digestRight = other.asAttachment().getDigest();
-
-        return Arrays.equals(digestLeft, digestRight);
-      }
-    }
-
-    return false;
-  }
-
-  private GlideRequest<Drawable> buildThumbnailGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
-    GlideRequest<Drawable> request = applySizing(glideRequests.load(new DecryptableUri(Objects.requireNonNull(slide.getUri())))
-                                                              .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-                                                              .downsample(SignalDownsampleStrategy.CENTER_OUTSIDE_NO_UPSCALE)
-                                                              .transition(withCrossFade()));
-
-    boolean doNotShowMissingThumbnailImage = Build.VERSION.SDK_INT < 23;
-
-    if (slide.isInProgress() || doNotShowMissingThumbnailImage) {
-      return request;
-    } else {
-      return request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture));
-    }
+  public void setProgressWheelClickListener(SlideClickListener listener) {
+    this.progressWheelClickListener = listener;
   }
 
   public void clear(GlideRequests glideRequests) {
@@ -571,12 +543,13 @@ public class ThumbnailView extends FrameLayout {
     slide = null;
   }
 
-  public void showSecondaryText(boolean showSecondaryText) {
-    transferControlViewStub.get().setShowSecondaryText(showSecondaryText);
+  public void showDownloadText(boolean showDownloadText) {
+    transferControlsState = transferControlsState.withDownloadText(showDownloadText);
+    transferControlsState.applyState(transferControlViewStub);
   }
 
   public void showProgressSpinner() {
-    transferControlViewStub.get().setVisible(true);
+    transferControlViewStub.get().showProgressSpinner();
   }
 
   public void setScaleType(@NonNull ImageView.ScaleType scaleType) {
@@ -593,6 +566,20 @@ public class ThumbnailView extends FrameLayout {
     invalidate();
   }
 
+  private GlideRequest<Drawable> buildThumbnailGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
+    GlideRequest<Drawable> request = applySizing(glideRequests.load(new DecryptableUri(Objects.requireNonNull(slide.getUri())))
+                                                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                                                    .downsample(SignalDownsampleStrategy.CENTER_OUTSIDE_NO_UPSCALE)
+                                                    .transition(withCrossFade()));
+
+    boolean doNotShowMissingThumbnailImage = Build.VERSION.SDK_INT < 23;
+
+    if (slide.isInProgress() || doNotShowMissingThumbnailImage) {
+      return request;
+    } else {
+      return request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture));
+    }
+  }
 
   private RequestBuilder<Bitmap> buildPlaceholderGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
     GlideRequest<Bitmap> bitmap          = glideRequests.asBitmap();
@@ -604,12 +591,7 @@ public class ThumbnailView extends FrameLayout {
       bitmap = bitmap.load(slide.getPlaceholderRes(getContext().getTheme()));
     }
 
-    final GlideRequest<Bitmap> resizedRequest = applySizing(bitmap.diskCacheStrategy(DiskCacheStrategy.NONE));
-    if (placeholderBlur != null) {
-      return resizedRequest.centerCrop();
-    } else {
-      return resizedRequest;
-    }
+    return applySizing(bitmap.diskCacheStrategy(DiskCacheStrategy.NONE));
   }
 
   private <TranscodeType> GlideRequest<TranscodeType> applySizing(@NonNull GlideRequest<TranscodeType> request) {
@@ -639,6 +621,19 @@ public class ThumbnailView extends FrameLayout {
     return 0;
   }
 
+  private static boolean hasSameContents(@Nullable Slide slide, @Nullable Slide other) {
+    if (Util.equals(slide, other)) {
+
+      if (slide != null && other != null) {
+        byte[] digestLeft = slide.asAttachment().getDigest();
+        byte[] digestRight = other.asAttachment().getDigest();
+
+        return Arrays.equals(digestLeft, digestRight);
+      }
+    }
+
+    return false;
+  }
 
   public interface ThumbnailRequestListener extends RequestListener<Drawable> {
     void onLoadCanceled();
@@ -675,26 +670,14 @@ public class ThumbnailView extends FrameLayout {
     }
   }
 
-  private class CancelClickDispatcher implements View.OnClickListener {
+  private class ProgressWheelClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      Log.i(TAG, "onClick() for cancel button");
-      if (cancelDownloadClickListener != null && slide != null) {
-        cancelDownloadClickListener.onClick(view, Collections.singletonList(slide));
+      Log.i(TAG, "onClick() for progress wheel");
+      if (progressWheelClickListener != null && slide != null) {
+        progressWheelClickListener.onClick(view, slide);
       } else {
-        Log.w(TAG, "Received a cancel button click, but unable to execute it. slide: " + slide + "  cancelDownloadClickListener: " + cancelDownloadClickListener);
-      }
-    }
-  }
-
-  private class InstantVideoClickDispatcher implements View.OnClickListener {
-    @Override
-    public void onClick(View view) {
-      Log.i(TAG, "onClick() for instant video playback");
-      if (playVideoClickListener != null && slide != null) {
-        playVideoClickListener.onClick(view, slide);
-      } else {
-        Log.w(TAG, "Received an instant video click, but unable to execute it. slide: " + slide + "  playVideoClickListener: " + playVideoClickListener);
+        Log.w(TAG, "Received a progress wheel click, but unable to execute it. slide: " + slide + "  progressWheelClickListener: " + progressWheelClickListener);
       }
     }
   }

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

@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.components
+
+import android.view.View.OnClickListener
+import org.thoughtcrime.securesms.mms.Slide
+import org.thoughtcrime.securesms.util.views.Stub
+
+/**
+ * State object for transfer controls.
+ */
+data class ThumbnailViewTransferControlsState(
+  val isFocusable: Boolean = true,
+  val isClickable: Boolean = true,
+  val slide: Slide? = null,
+  val downloadClickedListener: OnClickListener? = null,
+  val progressWheelClickedListener: OnClickListener? = null,
+  val showDownloadText: Boolean = true
+) {
+
+  fun withFocusable(isFocusable: Boolean): ThumbnailViewTransferControlsState = copy(isFocusable = isFocusable)
+  fun withClickable(isClickable: Boolean): ThumbnailViewTransferControlsState = copy(isClickable = isClickable)
+  fun withSlide(slide: Slide?): ThumbnailViewTransferControlsState = copy(slide = slide)
+  fun withDownloadClickListener(downloadClickedListener: OnClickListener): ThumbnailViewTransferControlsState = copy(downloadClickedListener = downloadClickedListener)
+  fun withProgressWheelClickListener(progressWheelClickedListener: OnClickListener): ThumbnailViewTransferControlsState = copy(progressWheelClickedListener = progressWheelClickedListener)
+  fun withDownloadText(showDownloadText: Boolean): ThumbnailViewTransferControlsState = copy(showDownloadText = showDownloadText)
+
+  fun applyState(transferControlView: Stub<TransferControlView>) {
+    if (transferControlView.resolved()) {
+      transferControlView.get().isFocusable = isFocusable
+      transferControlView.get().isClickable = isClickable
+      if (slide != null) {
+        transferControlView.get().setSlide(slide)
+      }
+      transferControlView.get().setDownloadClickListener(downloadClickedListener)
+      transferControlView.get().setProgressWheelClickListener(progressWheelClickedListener)
+      transferControlView.get().setShowDownloadText(showDownloadText)
+    }
+  }
+}

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -0,0 +1,273 @@
+package org.thoughtcrime.securesms.components;
+
+import android.animation.LayoutTransition;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import com.annimon.stream.Stream;
+import com.pnikosis.materialishprogress.ProgressWheel;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.events.PartProgressEvent;
+import org.thoughtcrime.securesms.mms.Slide;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public final class TransferControlView extends FrameLayout {
+
+  private static final String TAG = "TransferControlView";
+  private static final int UPLOAD_TASK_WEIGHT = 1;
+
+  /**
+   * A weighting compared to {@link #UPLOAD_TASK_WEIGHT}
+   */
+  private static final int COMPRESSION_TASK_WEIGHT = 3;
+
+  @Nullable private List<Slide> slides;
+  @Nullable private View        current;
+
+  private final ProgressWheel progressWheel;
+  private final View          downloadDetails;
+  private final TextView      downloadDetailsText;
+
+  private final Map<Attachment, Float> networkProgress;
+  private final Map<Attachment, Float> compresssionProgress;
+
+  public TransferControlView(Context context) {
+    this(context, null);
+  }
+
+  public TransferControlView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public TransferControlView(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    inflate(context, R.layout.transfer_controls_view, this);
+
+    setLongClickable(false);
+    setBackground(ContextCompat.getDrawable(context, R.drawable.transfer_controls_background));
+    setVisibility(GONE);
+    setLayoutTransition(new LayoutTransition());
+
+    this.networkProgress      = new HashMap<>();
+    this.compresssionProgress = new HashMap<>();
+
+    this.progressWheel       = findViewById(R.id.progress_wheel);
+    this.downloadDetails     = findViewById(R.id.download_details);
+    this.downloadDetailsText = findViewById(R.id.download_details_text);
+  }
+
+  @Override
+  public void setFocusable(boolean focusable) {
+    super.setFocusable(focusable);
+    downloadDetails.setFocusable(focusable);
+  }
+
+  @Override
+  public void setClickable(boolean clickable) {
+    super.setClickable(clickable);
+    downloadDetails.setClickable(clickable);
+  }
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    EventBus.getDefault().unregister(this);
+  }
+
+  public void setSlide(final @NonNull Slide slides) {
+    setSlides(Collections.singletonList(slides));
+  }
+
+  public void setSlides(final @NonNull List<Slide> slides) {
+    if (slides.isEmpty()) {
+      throw new IllegalArgumentException("Must provide at least one slide.");
+    }
+
+    this.slides = slides;
+
+    if (!isUpdateToExistingSet(slides)) {
+      networkProgress.clear();
+      compresssionProgress.clear();
+      Stream.of(slides).forEach(s -> networkProgress.put(s.asAttachment(), 0f));
+    }
+    
+    for (Slide slide : slides) {
+      if (slide.asAttachment().getTransferState() == AttachmentTable.TRANSFER_PROGRESS_DONE) {
+        networkProgress.put(slide.asAttachment(), 1f);
+      }
+    }
+
+    switch (getTransferState(slides)) {
+      case AttachmentTable.TRANSFER_PROGRESS_STARTED:
+        showProgressSpinner(calculateProgress(networkProgress, compresssionProgress));
+        break;
+      case AttachmentTable.TRANSFER_PROGRESS_PENDING:
+      case AttachmentTable.TRANSFER_PROGRESS_FAILED:
+        String downloadText = getDownloadText(this.slides);
+        if (!Objects.equals(downloadText, downloadDetailsText.getText().toString())) {
+          downloadDetailsText.setText(getDownloadText(this.slides));
+        }
+
+        display(downloadDetails);
+        break;
+      default:
+        display(null);
+        break;
+    }
+  }
+
+  public void showProgressSpinner() {
+    showProgressSpinner(calculateProgress(networkProgress, compresssionProgress));
+  }
+
+  public void showProgressSpinner(float progress) {
+    if (progress == 0) {
+      progressWheel.spin();
+    } else {
+      progressWheel.setInstantProgress(progress);
+    }
+
+    display(progressWheel);
+  }
+
+  public void setDownloadClickListener(final @Nullable OnClickListener listener) {
+    downloadDetails.setOnClickListener(listener);
+  }
+
+  public void setProgressWheelClickListener(final @Nullable OnClickListener listener) {
+    progressWheel.setOnClickListener(listener);
+  }
+
+  public void clear() {
+    clearAnimation();
+    setVisibility(GONE);
+    if (current != null) {
+      current.clearAnimation();
+      current.setVisibility(GONE);
+    }
+    current = null;
+    slides = null;
+  }
+
+  public void setShowDownloadText(boolean showDownloadText) {
+    downloadDetailsText.setVisibility(showDownloadText ? VISIBLE : GONE);
+    forceLayout();
+  }
+
+  private boolean isUpdateToExistingSet(@NonNull List<Slide> slides) {
+    if (slides.size() != networkProgress.size()) {
+      return false;
+    }
+
+    for (Slide slide : slides) {
+      if (!networkProgress.containsKey(slide.asAttachment())) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  static int getTransferState(@NonNull List<Slide> slides) {
+    int     transferState = AttachmentTable.TRANSFER_PROGRESS_DONE;
+    boolean allFailed     = true;
+
+    for (Slide slide : slides) {
+      if (slide.getTransferState() != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE) {
+        allFailed = false;
+        if (slide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_PENDING && transferState == AttachmentTable.TRANSFER_PROGRESS_DONE) {
+          transferState = slide.getTransferState();
+        } else {
+          transferState = Math.max(transferState, slide.getTransferState());
+        }
+      }
+    }
+    return allFailed ? AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE : transferState;
+  }
+
+  private String getDownloadText(@NonNull List<Slide> slides) {
+    if (slides.size() == 1) {
+      return slides.get(0).getContentDescription(getContext());
+    } else {
+      int downloadCount = Stream.of(slides).reduce(0, (count, slide) -> slide.getTransferState() != AttachmentTable.TRANSFER_PROGRESS_DONE ? count + 1 : count);
+      return getContext().getResources().getQuantityString(R.plurals.TransferControlView_n_items, downloadCount, downloadCount);
+    }
+  }
+
+  private void display(@Nullable final View view) {
+    if (current == view) {
+      return;
+    }
+
+    if (current != null) {
+      current.setVisibility(GONE);
+    }
+
+    if (view != null) {
+      view.setVisibility(VISIBLE);
+      setVisibility(VISIBLE);
+    } else {
+      setVisibility(GONE);
+    }
+
+    current = view;
+  }
+
+  private static float calculateProgress(@NonNull Map<Attachment, Float> uploadDownloadProgress, Map<Attachment, Float> compresssionProgress) {
+    float totalDownloadProgress    = 0;
+    float totalCompressionProgress = 0;
+
+    for (float progress : uploadDownloadProgress.values()) {
+      totalDownloadProgress += progress;
+    }
+
+    for (float progress : compresssionProgress.values()) {
+      totalCompressionProgress += progress;
+    }
+
+    float weightedProgress = UPLOAD_TASK_WEIGHT * totalDownloadProgress         + COMPRESSION_TASK_WEIGHT * totalCompressionProgress;
+    float weightedTotal    = UPLOAD_TASK_WEIGHT * uploadDownloadProgress.size() + COMPRESSION_TASK_WEIGHT * compresssionProgress.size();
+
+    return weightedProgress / weightedTotal;
+  }
+
+  @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+  public void onEventAsync(final PartProgressEvent event) {
+    final Attachment attachment = event.attachment;
+    if (networkProgress.containsKey(attachment)) {
+      float proportionCompleted = ((float) event.progress) / event.total;
+
+      if (event.type == PartProgressEvent.Type.COMPRESSION) {
+        compresssionProgress.put(attachment, proportionCompleted);
+      } else {
+        networkProgress.put(attachment, proportionCompleted);
+      }
+
+      progressWheel.setInstantProgress(calculateProgress(networkProgress, compresssionProgress));
+    }
+  }
+}

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -9,9 +10,13 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.exifinterface.media.ExifInterface;
 
+import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;

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

@@ -32,6 +32,7 @@ import androidx.core.view.GestureDetectorCompat;
 import androidx.core.view.ViewKt;
 import androidx.core.widget.TextViewCompat;
 
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
@@ -311,6 +312,13 @@ public class EmojiTextView extends AppCompatTextView {
     setText(previousText, BufferType.SPANNABLE);
   }
 
+  public void setForceCustomEmoji(boolean forceCustom) {
+    if (this.forceCustom != forceCustom) {
+      this.forceCustom = forceCustom;
+      setText(previousText, BufferType.SPANNABLE);
+    }
+  }
+
   @SuppressLint("ClickableViewAccessibility")
   public void bindGestureListener() {
     GestureDetectorCompat gestureDetectorCompat = new GestureDetectorCompat(getContext(), new OnGestureListener());
@@ -354,10 +362,10 @@ public class EmojiTextView extends AppCompatTextView {
           return;
         }
 
-        int          overflowEnd = getLayout().getLineEnd(maxLines);
+        int          overflowEnd = getLayout().getLineEnd(maxLines - 1);
         CharSequence overflow    = getText().subSequence(overflowStart, overflowEnd);
         float        adjust      = overflowText != null ? getPaint().measureText(overflowText, 0, overflowText.length()) : 0f;
-        CharSequence ellipsized  = TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END);
+        CharSequence ellipsized  = StringUtil.trim(TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END));
 
         SpannableStringBuilder newContent = new SpannableStringBuilder();
         newContent.append(getText().subSequence(0, overflowStart).toString())

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

@@ -4,7 +4,6 @@ import androidx.annotation.WorkerThread
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
-import okio.ByteString.Companion.toByteString
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.IdentityKeyPair
 import org.signal.libsignal.protocol.SignalProtocolAddress
@@ -18,6 +17,7 @@ import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingChangeNumberMetadata
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.keyvalue.CertificateType
@@ -42,7 +42,7 @@ import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
-import org.whispersystems.signalservice.internal.push.SyncMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
 import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException
@@ -367,13 +367,13 @@ class ChangeNumberRepository(
 
         // Device Messages
         if (deviceId != primaryDeviceId) {
-          val pniChangeNumber = SyncMessage.PniChangeNumber(
-            identityKeyPair = pniIdentity.serialize().toByteString(),
-            signedPreKey = signedPreKeyRecord.serialize().toByteString(),
-            lastResortKyberPreKey = lastResortKyberPreKeyRecord.serialize().toByteString(),
-            registrationId = pniRegistrationId,
-            newE164 = newE164
-          )
+          val pniChangeNumber = SyncMessage.PniChangeNumber.newBuilder()
+            .setIdentityKeyPair(pniIdentity.serialize().toProtoByteString())
+            .setSignedPreKey(signedPreKeyRecord.serialize().toProtoByteString())
+            .setLastResortKyberPreKey(lastResortKyberPreKeyRecord.serialize().toProtoByteString())
+            .setRegistrationId(pniRegistrationId)
+            .setNewE164(newE164)
+            .build()
 
           deviceMessages += messageSender.getEncryptedSyncPniInitializeDeviceMessage(deviceId, pniChangeNumber)
         }
@@ -391,12 +391,12 @@ class ChangeNumberRepository(
       pniRegistrationIds.mapKeys { it.key.toString() }
     )
 
-    val metadata = PendingChangeNumberMetadata(
-      previousPni = SignalStore.account().pni!!.toByteString(),
-      pniIdentityKeyPair = pniIdentity.serialize().toByteString(),
-      pniRegistrationId = pniRegistrationIds[primaryDeviceId]!!,
-      pniSignedPreKeyId = devicePniSignedPreKeys[primaryDeviceId]!!.keyId
-    )
+    val metadata = PendingChangeNumberMetadata.newBuilder()
+      .setPreviousPni(SignalStore.account().pni!!.toByteString())
+      .setPniIdentityKeyPair(pniIdentity.serialize().toProtoByteString())
+      .setPniRegistrationId(pniRegistrationIds[primaryDeviceId]!!)
+      .setPniSignedPreKeyId(devicePniSignedPreKeys[primaryDeviceId]!!.keyId)
+      .build()
 
     return ChangeNumberRequestData(request, metadata)
   }

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

@@ -725,7 +725,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun enqueueSubscriptionRedemption() {
-    SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain(-1L).enqueue()
+    SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue()
   }
 
   private fun enqueueSubscriptionKeepAlive() {
@@ -768,7 +768,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
   private fun clearKeepLongerLogs() {
     SimpleTask.run({
-      LogDatabase.getInstance(requireActivity().application).logs.clearKeepLonger()
+      LogDatabase.getInstance(requireActivity().application).clearKeepLonger()
     }) {
       Toast.makeText(requireContext(), "Cleared keep longer logs", Toast.LENGTH_SHORT).show()
     }

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

@@ -32,7 +32,7 @@ class InternalSettingsRepository(context: Context) {
       val title = "Release Note Title"
       val bodyText = "Release note body. Aren't I awesome?"
       val body = "$title\n\n$bodyText"
-      val bodyRangeList = BodyRangeList.Builder()
+      val bodyRangeList = BodyRangeList.newBuilder()
         .addStyle(BodyRangeList.BodyRange.Style.BOLD, 0, title.length)
 
       val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!

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

@@ -8,20 +8,17 @@
 package org.thoughtcrime.securesms.components.settings.app.internal.search
 
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
-import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -55,21 +52,15 @@ class InternalSearchFragment : ComposeFragment() {
 
 @Composable
 fun InternalSearchFragmentScreen(query: String, results: ImmutableList<InternalSearchResult>, onSearchUpdated: (String) -> Unit, modifier: Modifier = Modifier) {
-  val backgroundColor = MaterialTheme.colorScheme.surface
-
-  CompositionLocalProvider(LocalContentColor provides contentColorFor(backgroundColor = backgroundColor)) {
-    LazyColumn(
-      modifier = modifier
-        .fillMaxWidth()
-        .background(backgroundColor)
-    ) {
-      item(key = -1) {
-        SearchBar(query, onSearchUpdated)
-      }
-      results.forEach { recipient ->
-        item(key = recipient.id) {
-          ResultItem(recipient)
-        }
+  LazyColumn(
+    modifier = modifier.fillMaxWidth()
+  ) {
+    item(key = -1) {
+      SearchBar(query, onSearchUpdated)
+    }
+    results.forEach { recipient ->
+      item(key = recipient.id) {
+        ResultItem(recipient)
       }
     }
   }
@@ -94,9 +85,7 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
       .fillMaxWidth()
       .clickable {
         if (activity != null) {
-          RecipientBottomSheetDialogFragment
-            .create(result.id, result.groupId)
-            .show(activity.supportFragmentManager, "TAG")
+          RecipientBottomSheetDialogFragment.create(result.id, result.groupId).show(activity.supportFragmentManager, "TAG")
         }
       }
       .padding(8.dp)
@@ -112,7 +101,9 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
 @Composable
 fun InternalSearchScreenPreviewLightTheme() {
   SignalTheme(isDarkMode = false) {
-    InternalSearchScreenPreview()
+    Surface {
+      InternalSearchScreenPreview()
+    }
   }
 }
 
@@ -120,7 +111,9 @@ fun InternalSearchScreenPreviewLightTheme() {
 @Composable
 fun InternalSearchScreenPreviewDarkTheme() {
   SignalTheme(isDarkMode = true) {
-    InternalSearchScreenPreview()
+    Surface {
+      InternalSearchScreenPreview()
+    }
   }
 }
 

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

@@ -14,7 +14,6 @@ import java.util.Currency
 
 private const val CARD = "CARD"
 private const val PAYPAL = "PAYPAL"
-private const val SEPA_DEBIT = "SEPA_DEBIT"
 
 /**
  * Transforms the DonationsConfiguration into a Set<FiatMoney> which has been properly filtered
@@ -117,7 +116,6 @@ private fun DonationsConfiguration.getFilteredCurrencies(paymentMethodAvailabili
 interface PaymentMethodAvailability {
   fun isPayPalAvailable(): Boolean
   fun isGooglePayOrCreditCardAvailable(): Boolean
-  fun isSEPADebitAvailable(): Boolean
 
   fun toSet(): Set<String> {
     val set = mutableSetOf<String>()
@@ -129,10 +127,6 @@ interface PaymentMethodAvailability {
       set.add(CARD)
     }
 
-    if (isSEPADebitAvailable()) {
-      set.add(SEPA_DEBIT)
-    }
-
     return set
   }
 }
@@ -140,5 +134,4 @@ interface PaymentMethodAvailability {
 private object DefaultPaymentMethodAvailability : PaymentMethodAvailability {
   override fun isPayPalAvailable(): Boolean = InAppDonations.isPayPalAvailable()
   override fun isGooglePayOrCreditCardAvailable(): Boolean = InAppDonations.isCreditCardAvailable() || InAppDonations.isGooglePayAvailable()
-  override fun isSEPADebitAvailable(): Boolean = InAppDonations.isSEPADebitAvailable()
 }

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

@@ -16,11 +16,10 @@ object InAppDonations {
    *
    * - 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 SEPA Debit and is in a region where they are able to be accepted.
    * - Able to use PayPal and is in a region where it is able to be accepted.
    */
   fun hasAtLeastOnePaymentMethodAvailable(): Boolean {
-    return isCreditCardAvailable() || isPayPalAvailable() || isGooglePayAvailable() || isSEPADebitAvailable()
+    return isCreditCardAvailable() || isPayPalAvailable() || isGooglePayAvailable()
   }
 
   fun isPaymentSourceAvailable(paymentSourceType: PaymentSourceType, donateToSignalType: DonateToSignalType): Boolean {
@@ -28,7 +27,6 @@ object InAppDonations {
       PaymentSourceType.PayPal -> isPayPalAvailableForDonateToSignalType(donateToSignalType)
       PaymentSourceType.Stripe.CreditCard -> isCreditCardAvailable()
       PaymentSourceType.Stripe.GooglePay -> isGooglePayAvailable()
-      PaymentSourceType.Stripe.SEPADebit -> isSEPADebitAvailable()
       PaymentSourceType.Unknown -> false
     }
   }
@@ -60,11 +58,4 @@ object InAppDonations {
   fun isGooglePayAvailable(): Boolean {
     return SignalStore.donationsValues().isGooglePayReady && !LocaleFeatureFlags.isGooglePayDisabled()
   }
-
-  /**
-   * Whether the user is in a region which supports SEPA Debit transfers, based off local phone number.
-   */
-  fun isSEPADebitAvailable(): Boolean {
-    return FeatureFlags.sepaDebitDonations()
-  }
 }

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

@@ -79,29 +79,9 @@ class MonthlyDonationRepository(private val donationsService: DonationsService)
     }.subscribeOn(Schedulers.io())
   }
 
-  /**
-   * Since PayPal and Stripe can't interoperate, we need to be able to rotate the subscriber ID
-   * in case of failures.
-   */
-  fun rotateSubscriberId(): Completable {
-    Log.d(TAG, "Rotating SubscriberId due to alternate payment processor...", true)
-    val cancelCompletable: Completable = if (SignalStore.donationsValues().getSubscriber() != null) {
-      cancelActiveSubscription().andThen(updateLocalSubscriptionStateAndScheduleDataSync())
-    } else {
-      Completable.complete()
-    }
-
-    return cancelCompletable.andThen(ensureSubscriberId(isRotation = true))
-  }
-
-  fun ensureSubscriberId(isRotation: Boolean = false): Completable {
-    Log.d(TAG, "Ensuring SubscriberId exists on Signal service {isRotation?$isRotation}...", true)
-    val subscriberId: SubscriberId = if (isRotation) {
-      SubscriberId.generate()
-    } else {
-      SignalStore.donationsValues().getSubscriber()?.subscriberId ?: SubscriberId.generate()
-    }
-
+  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)
@@ -147,7 +127,7 @@ class MonthlyDonationRepository(private val donationsService: DonationsService)
     }
   }
 
-  fun setSubscriptionLevel(subscriptionLevel: String, uiSessionKey: Long): Completable {
+  fun setSubscriptionLevel(subscriptionLevel: String): Completable {
     return getOrCreateLevelUpdateOperation(subscriptionLevel)
       .flatMapCompletable { levelUpdateOperation ->
         val subscriber = SignalStore.donationsValues().requireSubscriber()
@@ -186,7 +166,7 @@ class MonthlyDonationRepository(private val donationsService: DonationsService)
             val countDownLatch = CountDownLatch(1)
             var finalJobState: JobTracker.JobState? = null
 
-            SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain(uiSessionKey).enqueue { _, jobState ->
+            SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue { _, jobState ->
               if (jobState.isComplete) {
                 finalJobState = jobState
                 countDownLatch.countDown()
@@ -242,18 +222,4 @@ class MonthlyDonationRepository(private val donationsService: DonationsService)
       levelUpdateOperation
     }
   }
-
-  /**
-   * Update local state information and schedule a storage sync for the change. This method
-   * assumes you've already properly called the DELETE method for the stored ID on the server.
-   */
-  private fun updateLocalSubscriptionStateAndScheduleDataSync(): Completable {
-    return Completable.fromAction {
-      Log.d(TAG, "Marking subscription cancelled...", true)
-      SignalStore.donationsValues().updateLocalStateForManualCancellation()
-      MultiDeviceSubscriptionSyncRequestJob.enqueue()
-      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-      StorageSyncHelper.scheduleSyncForDataChange()
-    }
-  }
 }

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

@@ -111,8 +111,7 @@ class OneTimeDonationRepository(private val donationsService: DonationsService)
     badgeRecipient: RecipientId,
     additionalMessage: String?,
     badgeLevel: Long,
-    donationProcessor: DonationProcessor,
-    uiSessionKey: Long
+    donationProcessor: DonationProcessor
   ): Completable {
     val isBoost = badgeRecipient == Recipient.self().id
     val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.BOOST else DonationErrorSource.GIFT
@@ -132,9 +131,9 @@ class OneTimeDonationRepository(private val donationsService: DonationsService)
       val countDownLatch = CountDownLatch(1)
       var finalJobState: JobTracker.JobState? = null
       val chain = if (isBoost) {
-        BoostReceiptRequestResponseJob.createJobChainForBoost(paymentIntentId, donationProcessor, uiSessionKey)
+        BoostReceiptRequestResponseJob.createJobChainForBoost(paymentIntentId, donationProcessor)
       } else {
-        BoostReceiptRequestResponseJob.createJobChainForGift(paymentIntentId, badgeRecipient, additionalMessage, badgeLevel, donationProcessor, uiSessionKey)
+        BoostReceiptRequestResponseJob.createJobChainForGift(paymentIntentId, badgeRecipient, additionalMessage, badgeLevel, donationProcessor)
       }
 
       chain.enqueue { _, jobState ->

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

@@ -29,8 +29,6 @@ class PayPalRepository(private val donationsService: DonationsService) {
     private val TAG = Log.tag(PayPalRepository::class.java)
   }
 
-  private val monthlyDonationRepository = MonthlyDonationRepository(donationsService)
-
   fun createOneTimePaymentIntent(
     amount: FiatMoney,
     badgeRecipient: RecipientId,
@@ -71,12 +69,7 @@ class PayPalRepository(private val donationsService: DonationsService) {
     }.flatMap { it.flattenResult() }.subscribeOn(Schedulers.io())
   }
 
-  /**
-   * Creates the PaymentMethod via the Signal Service. Note that if the operation fails with a 409,
-   * it means that the PaymentMethod is already tied to a Stripe account. We can retry in this
-   * situation by simply deleting the old subscriber id on the service and replacing it.
-   */
-  fun createPaymentMethod(retryOn409: Boolean = true): Single<PayPalCreatePaymentMethodResponse> {
+  fun createPaymentMethod(): Single<PayPalCreatePaymentMethodResponse> {
     return Single.fromCallable {
       donationsService.createPayPalPaymentMethod(
         Locale.getDefault(),
@@ -84,13 +77,7 @@ class PayPalRepository(private val donationsService: DonationsService) {
         MONTHLY_RETURN_URL,
         CANCEL_URL
       )
-    }.flatMap { serviceResponse ->
-      if (retryOn409 && serviceResponse.status == 409) {
-        monthlyDonationRepository.rotateSubscriberId().andThen(createPaymentMethod(retryOn409 = false))
-      } else {
-        serviceResponse.flattenResult()
-      }
-    }.subscribeOn(Schedulers.io())
+    }.flatMap { it.flattenResult() }.subscribeOn(Schedulers.io())
   }
 
   fun setDefaultPaymentMethod(paymentMethodId: String): Completable {

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

@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.errors.Do
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -47,8 +46,7 @@ import org.whispersystems.signalservice.internal.ServiceResponse
 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(), StandardUserAgentInterceptor.USER_AGENT)
-  private val monthlyDonationRepository = MonthlyDonationRepository(ApplicationDependencies.getDonationsService())
+  private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, ApplicationDependencies.getOkHttpClient())
 
   fun isGooglePayAvailable(): Completable {
     return googlePayApi.queryIsReadyToPay()
@@ -91,11 +89,9 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
     badgeLevel: Long,
     paymentSourceType: PaymentSourceType
   ): Single<StripeIntentAccessor> {
-    check(paymentSourceType is PaymentSourceType.Stripe)
-
     Log.d(TAG, "Creating payment intent for $price...", true)
 
-    return stripeApi.createPaymentIntent(price, badgeLevel, paymentSourceType)
+    return stripeApi.createPaymentIntent(price, badgeLevel)
       .onErrorResumeNext {
         OneTimeDonationRepository.handleCreatePaymentIntentError(it, badgeRecipient, paymentSourceType)
       }
@@ -113,12 +109,9 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
       }.subscribeOn(Schedulers.io())
   }
 
-  fun createAndConfirmSetupIntent(
-    paymentSource: StripeApi.PaymentSource,
-    paymentSourceType: PaymentSourceType.Stripe
-  ): Single<StripeApi.Secure3DSAction> {
+  fun createAndConfirmSetupIntent(paymentSource: StripeApi.PaymentSource): Single<StripeApi.Secure3DSAction> {
     Log.d(TAG, "Continuing subscription setup...", true)
-    return stripeApi.createSetupIntent(paymentSourceType)
+    return stripeApi.createSetupIntent()
       .flatMap { result ->
         Log.d(TAG, "Retrieved SetupIntent, confirming...", true)
         stripeApi.confirmSetupIntent(paymentSource, result.setupIntent)
@@ -140,13 +133,13 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
       }
   }
 
-  override fun fetchPaymentIntent(price: FiatMoney, level: Long, sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
+  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, sourceType.paymentMethod)
+          .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level)
       }
       .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
       .map {
@@ -160,32 +153,17 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
       }
   }
 
-  /**
-   * Creates the PaymentMethod via the Signal Service. Note that if the operation fails with a 409,
-   * it means that the PaymentMethod is already tied to a PayPal account. We can retry in this
-   * situation by simply deleting the old subscriber id on the service and replacing it.
-   */
-  private fun createPaymentMethod(paymentSourceType: PaymentSourceType.Stripe, retryOn409: Boolean = true): Single<StripeClientSecret> {
+  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, paymentSourceType.paymentMethod)
+            .createStripeSubscriptionPaymentMethod(it.subscriberId)
         }
       }
-      .flatMap { serviceResponse ->
-        if (retryOn409 && serviceResponse.status == 409) {
-          monthlyDonationRepository.rotateSubscriberId().andThen(createPaymentMethod(paymentSourceType, retryOn409 = false))
-        } else {
-          serviceResponse.flattenResult()
-        }
-      }
-  }
-
-  override fun fetchSetupIntent(sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
-    Log.d(TAG, "Fetching setup intent from Signal service...")
-    return createPaymentMethod(sourceType)
+      .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
       .map {
         StripeIntentAccessor(
           objectType = StripeIntentAccessor.ObjectType.SETUP_INTENT,
@@ -213,7 +191,6 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
           }
           StatusAndPaymentMethodId(it.status ?: StripeIntentStatus.SUCCEEDED, it.paymentMethod)
         }
-
         StripeIntentAccessor.ObjectType.SETUP_INTENT -> stripeApi.getSetupIntent(stripeIntentAccessor).let {
           StatusAndPaymentMethodId(it.status, it.paymentMethod)
         }
@@ -252,11 +229,6 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
     }
   }
 
-  fun createSEPADebitPaymentSource(sepaDebitData: StripeApi.SEPADebitData): Single<StripeApi.PaymentSource> {
-    Log.d(TAG, "Creating SEPA Debit payment source via Stripe api...")
-    return stripeApi.createPaymentSourceFromSEPADebitData(sepaDebitData)
-  }
-
   data class StatusAndPaymentMethodId(
     val status: StripeIntentStatus,
     val paymentMethod: String?

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

@@ -106,7 +106,7 @@ class DonateToSignalFragment :
   }
 
   override fun bindAdapter(adapter: MappingAdapter) {
-    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, viewModel.uiSessionKey, DonationErrorSource.BOOST, DonationErrorSource.SUBSCRIPTION)
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, DonationErrorSource.BOOST, DonationErrorSource.SUBSCRIPTION)
 
     val recyclerView = this.recyclerView!!
     recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS
@@ -417,10 +417,6 @@ class DonateToSignalFragment :
     findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToCreditCardFragment(gatewayRequest))
   }
 
-  override fun navigateToBankTransferMandate(gatewayRequest: GatewayRequest) {
-    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToBankTransferMandateFragment(gatewayRequest))
-  }
-
   override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
     findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToThanksForYourSupportBottomSheetDialog(gatewayRequest.badge))
   }

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

@@ -58,7 +58,6 @@ class DonateToSignalViewModel(
 
   val state = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
   val actions: Observable<DonateToSignalAction> = _actions.observeOn(AndroidSchedulers.mainThread())
-  val uiSessionKey: Long = System.currentTimeMillis()
 
   init {
     initializeOneTimeDonationState(oneTimeDonationRepository)
@@ -179,7 +178,6 @@ class DonateToSignalViewModel(
   private fun createGatewayRequest(snapshot: DonateToSignalState): GatewayRequest {
     val amount = getAmount(snapshot)
     return GatewayRequest(
-      uiSessionKey = uiSessionKey,
       donateToSignalType = snapshot.donateToSignalType,
       badge = snapshot.badge!!,
       label = snapshot.badge!!.description,

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

@@ -43,7 +43,6 @@ import java.util.Currency
 class DonationCheckoutDelegate(
   private val fragment: Fragment,
   private val callback: Callback,
-  private val uiSessionKey: Long,
   errorSource: DonationErrorSource,
   vararg additionalSources: DonationErrorSource
 ) : DefaultLifecycleObserver {
@@ -66,7 +65,7 @@ class DonationCheckoutDelegate(
 
   init {
     fragment.viewLifecycleOwner.lifecycle.addObserver(this)
-    ErrorHandler().attach(fragment, callback, uiSessionKey, errorSource, *additionalSources)
+    ErrorHandler().attach(fragment, callback, errorSource, *additionalSources)
   }
 
   override fun onCreate(owner: LifecycleOwner) {
@@ -101,7 +100,6 @@ class DonationCheckoutDelegate(
         GatewayResponse.Gateway.GOOGLE_PAY -> launchGooglePay(gatewayResponse)
         GatewayResponse.Gateway.PAYPAL -> launchPayPal(gatewayResponse)
         GatewayResponse.Gateway.CREDIT_CARD -> launchCreditCard(gatewayResponse)
-        GatewayResponse.Gateway.SEPA_DEBIT -> launchSEPADebit(gatewayResponse)
       }
     } else {
       error("Unsupported combination! ${gatewayResponse.gateway} ${gatewayResponse.request.donateToSignalType}")
@@ -156,10 +154,6 @@ class DonationCheckoutDelegate(
     callback.navigateToCreditCardForm(gatewayResponse.request)
   }
 
-  private fun launchSEPADebit(gatewayResponse: GatewayResponse) {
-    callback.navigateToBankTransferMandate(gatewayResponse.request)
-  }
-
   private fun registerGooglePayCallback() {
     disposables += donationPaymentComponent.googlePayResultPublisher.subscribeBy(
       onNext = { paymentResult ->
@@ -212,7 +206,7 @@ class DonationCheckoutDelegate(
     private var errorDialog: DialogInterface? = null
     private var userCancelledFlowCallback: UserCancelledFlowCallback? = null
 
-    fun attach(fragment: Fragment, userCancelledFlowCallback: UserCancelledFlowCallback?, uiSessionKey: Long, errorSource: DonationErrorSource, vararg additionalSources: DonationErrorSource) {
+    fun attach(fragment: Fragment, userCancelledFlowCallback: UserCancelledFlowCallback?, errorSource: DonationErrorSource, vararg additionalSources: DonationErrorSource) {
       this.fragment = fragment
       this.userCancelledFlowCallback = userCancelledFlowCallback
 
@@ -224,8 +218,6 @@ class DonationCheckoutDelegate(
       additionalSources.forEach { source ->
         disposables += registerErrorSource(source)
       }
-
-      disposables += registerUiSession(uiSessionKey)
     }
 
     override fun onDestroy(owner: LifecycleOwner) {
@@ -242,14 +234,6 @@ class DonationCheckoutDelegate(
         }
     }
 
-    private fun registerUiSession(uiSessionKey: Long): Disposable {
-      return DonationError.getErrorsForUiSessionKey(uiSessionKey)
-        .observeOn(AndroidSchedulers.mainThread())
-        .subscribe {
-          showErrorDialog(it)
-        }
-    }
-
     private fun showErrorDialog(throwable: Throwable) {
       if (errorDialog != null) {
         Log.d(TAG, "Already displaying an error dialog. Skipping.", throwable, true)
@@ -297,7 +281,6 @@ class DonationCheckoutDelegate(
     fun navigateToStripePaymentInProgress(gatewayRequest: GatewayRequest)
     fun navigateToPayPalPaymentInProgress(gatewayRequest: GatewayRequest)
     fun navigateToCreditCardForm(gatewayRequest: GatewayRequest)
-    fun navigateToBankTransferMandate(gatewayRequest: GatewayRequest)
     fun onPaymentComplete(gatewayRequest: GatewayRequest)
     fun onProcessorActionProcessed()
   }

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

@@ -54,7 +54,7 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
       DonateToSignalType.GIFT -> DonationErrorSource.GIFT
     }
 
-    DonationCheckoutDelegate.ErrorHandler().attach(this, null, args.request.uiSessionKey, errorSource)
+    DonationCheckoutDelegate.ErrorHandler().attach(this, null, errorSource)
 
     setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
       val result: DonationProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, DonationProcessorActionResult::class.java)!!

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

@@ -12,7 +12,6 @@ import java.util.Currency
 
 @Parcelize
 data class GatewayRequest(
-  val uiSessionKey: Long,
   val donateToSignalType: DonateToSignalType,
   val badge: Badge,
   val label: String,

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

@@ -9,15 +9,13 @@ data class GatewayResponse(val gateway: Gateway, val request: GatewayRequest) :
   enum class Gateway {
     GOOGLE_PAY,
     PAYPAL,
-    CREDIT_CARD,
-    SEPA_DEBIT;
+    CREDIT_CARD;
 
     fun toPaymentSourceType(): PaymentSourceType {
       return when (this) {
         GOOGLE_PAY -> PaymentSourceType.Stripe.GooglePay
         PAYPAL -> PaymentSourceType.PayPal
         CREDIT_CARD -> PaymentSourceType.Stripe.CreditCard
-        SEPA_DEBIT -> PaymentSourceType.Stripe.SEPADebit
       }
     }
   }

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

@@ -115,20 +115,6 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         )
       }
 
-      if (state.isSEPADebitAvailable) {
-        space(8.dp)
-
-        primaryButton(
-          text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__bank_transfer),
-          icon = DSLSettingsIcon.from(R.drawable.credit_card, NO_TINT), // TODO [sepa] -- Final icon
-          onClick = {
-            findNavController().popBackStack()
-            val response = GatewayResponse(GatewayResponse.Gateway.SEPA_DEBIT, args.request)
-            setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to response))
-          }
-        )
-      }
-
       space(16.dp)
     }
   }

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

@@ -17,7 +17,6 @@ class GatewaySelectorRepository(
           when (it) {
             "PAYPAL" -> listOf(GatewayResponse.Gateway.PAYPAL)
             "CARD" -> listOf(GatewayResponse.Gateway.CREDIT_CARD, GatewayResponse.Gateway.GOOGLE_PAY)
-            "SEPA_DEBIT" -> listOf(GatewayResponse.Gateway.SEPA_DEBIT)
             else -> listOf()
           }
         }.flatten().toSet()