Fix label applied to inactive issues.

Co-authored-by: Greyson Parrelli <greyson@signal.org>

.editorconfig

@@ -20,6 +20,7 @@ ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled
 ktlint_standard_value-parameter-comment = disabled
 ktlint_standard_class-signature = disabled
 ktlint_standard_function-expression-body = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
 
 # Disable ktlint on generated source code, see
 # https://github.com/JLLeitschuh/ktlint-gradle/issues/746

.github/stale.yml

@@ -1,23 +0,0 @@
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 60
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
-
-issues:
-  exemptLabels:
-    - acknowledged
-
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale Issue or Pull Request.
-closeComment: >
-  This issue has been closed due to inactivity.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1

.github/workflows/stale.yml

@@ -0,0 +1,35 @@
+name: Mark stale issues and PRs
+
+on:
+  schedule:
+    - cron: '0 2 * * *'  # daily at 02:00 UTC
+  workflow_dispatch:
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/stale@v10
+        with:
+          days-before-stale: 60
+          days-before-close: 7
+          exempt-issue-labels: 'acknowledged'
+          stale-issue-label: 'wontfix'
+          stale-pr-label: 'wontfix'
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions!
+          stale-pr-message: >
+            This pull request has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions!
+          close-issue-message: >
+            This issue has been closed due to inactivity.
+          close-pr-message: >
+            This pull request has been closed due to inactivity.
+          operations-per-run: 30

app/build.gradle.kts

@@ -24,8 +24,8 @@ plugins {
 
 apply(from = "static-ips.gradle.kts")
 
-val canonicalVersionCode = 1666
-val canonicalVersionName = "8.3.2"
+val canonicalVersionCode = 1673
+val canonicalVersionName = "8.6.0"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100
 
@@ -92,6 +92,7 @@ wire {
 
   protoPath {
     srcDir("${project.rootDir}/lib/libsignal-service/src/main/protowire")
+    srcDir("${project.rootDir}/lib/archive/src/main/protowire")
   }
   // Handled by libsignal
   prune("signalservice.DecryptionErrorMessage")
@@ -594,6 +595,7 @@ dependencies {
   ktlintRuleset(libs.ktlint.twitter.compose)
   coreLibraryDesugaring(libs.android.tools.desugar)
 
+  implementation(project(":lib:archive"))
   implementation(project(":lib:libsignal-service"))
   implementation(project(":lib:paging"))
   implementation(project(":core:util"))
@@ -613,6 +615,7 @@ dependencies {
   implementation(project(":core:models-jvm"))
   implementation(project(":feature:camera"))
   implementation(project(":feature:registration"))
+  implementation(project(":lib:apng"))
 
   implementation(libs.androidx.fragment.ktx)
   implementation(libs.androidx.appcompat) {
@@ -654,6 +657,7 @@ dependencies {
   implementation(libs.androidx.concurrent.futures)
   implementation(libs.androidx.autofill)
   implementation(libs.androidx.biometric)
+  implementation(libs.androidx.core.telecom)
   implementation(libs.androidx.sharetarget)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.asynclayoutinflater)
@@ -746,6 +750,7 @@ dependencies {
   testImplementation(testFixtures(project(":lib:libsignal-service")))
   testImplementation(testLibs.espresso.core)
   testImplementation(testLibs.kotlinx.coroutines.test)
+  testImplementation(testLibs.sqlite.jdbc)
   testImplementation(libs.androidx.compose.ui.test.junit4)
 
   "perfImplementation"(libs.androidx.compose.ui.test.manifest)

app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt

@@ -13,6 +13,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.signal.archive.proto.Frame
+import org.signal.archive.stream.PlainTextBackupReader
 import org.signal.core.models.ServiceId
 import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
@@ -20,8 +22,6 @@ import org.signal.core.util.readFully
 import org.signal.libsignal.messagebackup.ComparableBackup
 import org.signal.libsignal.messagebackup.MessageBackup
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.backup.v2.proto.Frame
-import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupReader
 import org.thoughtcrime.securesms.database.KeyValueDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore

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

@@ -358,5 +358,9 @@ class V2ConversationItemShapeTest {
     override fun onToggleVote(poll: PollRecord, pollOption: PollOption, isChecked: Boolean) = Unit
 
     override fun onViewPinnedMessage(messageId: Long) = Unit
+
+    override fun onExpandEvents(messageId: Long, itemView: View, collapsedSize: Int) = Unit
+
+    override fun onCollapseEvents(messageId: Long, itemView: View, collapsedSize: Int) = Unit
   }
 }

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

@@ -0,0 +1,301 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.core.content.contentValuesOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.every
+import io.mockk.mockkStatic
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.models.ServiceId.ACI
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.util.RemoteConfig
+import java.util.UUID
+import kotlin.time.Duration.Companion.days
+
+@RunWith(AndroidJUnit4::class)
+class CollapsingMessagesTests {
+
+  private lateinit var message: MessageTable
+  private lateinit var thread: ThreadTable
+
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule()
+
+  private lateinit var alice: RecipientId
+  private var aliceThread: Long = 0
+
+  private lateinit var bob: RecipientId
+
+  @Before
+  fun setUp() {
+    mockkStatic(RemoteConfig::class)
+
+    every { RemoteConfig.collapseEvents } returns true
+
+    message = SignalDatabase.messages
+    message.deleteAllThreads()
+
+    thread = SignalDatabase.threads
+
+    alice = SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+    aliceThread = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
+    bob = SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+  }
+
+  @Test
+  fun givenCollapsibleMessage_whenIInsert_thenItBecomesHead() {
+    val messageId = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+
+    val msg = message.getMessageRecord(messageId)
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg.collapsedState)
+    assertEquals(messageId, msg.collapsedHeadId)
+  }
+
+  @Test
+  fun givenSameCollapsibleTypes_whenIInsert_thenAllCollapseUnderHead() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false).messageId
+    val messageId3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false).messageId
+
+    val msg1 = message.getMessageRecord(messageId1)
+    val msg2 = message.getMessageRecord(messageId2)
+    val msg3 = message.getMessageRecord(messageId3)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg1.collapsedState)
+    assertEquals(messageId1, msg1.collapsedHeadId)
+
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msg2.collapsedState)
+    assertEquals(messageId1, msg2.collapsedHeadId)
+
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msg3.collapsedState)
+    assertEquals(messageId1, msg3.collapsedHeadId)
+  }
+
+  @Test
+  fun givenDifferentCollapsedTypes_whenIInsert_thenNoCollapsing() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = MmsHelper.insert(message = OutgoingMessage.identityVerifiedMessage(Recipient.resolved(alice), 2000L), threadId = aliceThread)
+
+    val msg1 = message.getMessageRecord(messageId1)
+    val msg2 = message.getMessageRecord(messageId2)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg1.collapsedState)
+    assertEquals(messageId1, msg1.collapsedHeadId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg2.collapsedState)
+    assertEquals(messageId2, msg2.collapsedHeadId)
+  }
+
+  @Test
+  fun givenNonCollapsibleTypes_whenIInsert_thenNoCollapsing() {
+    val messageId = MmsHelper.insert(recipient = Recipient.resolved(alice), sentTimeMillis = 1000L)
+
+    val msg = message.getMessageRecord(messageId)
+    assertEquals(CollapsedState.NONE, msg.collapsedState)
+    assertEquals(0, msg.collapsedHeadId)
+  }
+
+  @Test
+  fun givenMessagesOnDifferentDays_whenIInsert_thenNoCollapsing() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+
+    message.writableDatabase.update(
+      MessageTable.TABLE_NAME,
+      contentValuesOf(MessageTable.DATE_RECEIVED to (System.currentTimeMillis() - 1.days.inWholeMilliseconds)),
+      "${MessageTable.ID} = ?",
+      arrayOf(messageId1.toString())
+    )
+
+    val messageId2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false).messageId
+
+    val msg2 = message.getMessageRecord(messageId2)
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg2.collapsedState)
+    assertEquals(messageId2, msg2.collapsedHeadId)
+  }
+
+  @Test
+  fun givenRegularMessageBetweenCollapsed_whenIInsertCollapsed_thenNoCollapsing() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = MmsHelper.insert(recipient = Recipient.resolved(alice), sentTimeMillis = 2000L)
+    val messageId3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false).messageId
+
+    val msg1 = message.getMessageRecord(messageId1)
+    val msg2 = message.getMessageRecord(messageId2)
+    val msg3 = message.getMessageRecord(messageId3)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg1.collapsedState)
+    assertEquals(messageId1, msg1.collapsedHeadId)
+
+    assertEquals(CollapsedState.NONE, msg2.collapsedState)
+    assertEquals(0, msg2.collapsedHeadId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg3.collapsedState)
+    assertEquals(messageId3, msg3.collapsedHeadId)
+  }
+
+  @Test
+  fun givenDifferentThreads_whenIInsertCollapsed_thenNoCollapsing() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = message.insertCallLog(bob, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false).messageId
+
+    val msg1 = message.getMessageRecord(messageId1)
+    val msg2 = message.getMessageRecord(messageId2)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg1.collapsedState)
+    assertEquals(messageId1, msg1.collapsedHeadId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg2.collapsedState)
+    assertEquals(messageId2, msg2.collapsedHeadId)
+  }
+
+  @Test
+  fun givenCollapsedMessages_whenIDeleteFirstMessage_thenNextMessageBecomesHead() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false).messageId
+    val messageId3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false).messageId
+
+    message.deleteMessage(messageId1, aliceThread)
+
+    val msg2 = message.getMessageRecord(messageId2)
+    val msg3 = message.getMessageRecord(messageId3)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg2.collapsedState)
+    assertEquals(messageId2, msg2.collapsedHeadId)
+
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msg3.collapsedState)
+    assertEquals(messageId2, msg3.collapsedHeadId)
+  }
+
+  @Test
+  fun givenCollapsedMessages_whenIDeleteNonFirstMessage_thenFirstMessageStaysHead() {
+    val messageId1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false).messageId
+    val messageId2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false).messageId
+    val messageId3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false).messageId
+
+    message.deleteMessage(messageId2, aliceThread)
+
+    val msg1 = message.getMessageRecord(messageId1)
+    val msg3 = message.getMessageRecord(messageId3)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msg1.collapsedState)
+    assertEquals(messageId1, msg1.collapsedHeadId)
+
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msg3.collapsedState)
+    assertEquals(messageId1, msg3.collapsedHeadId)
+  }
+
+  @Test
+  fun givenTwoCollapsingTypes_whenIDeleteHeadOfFirstGroup_thenSecondGroupIsUnchanged() {
+    val call1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false)
+    val call2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false)
+
+    val recipient = Recipient.resolved(alice)
+    val identity1Id = MmsHelper.insert(message = OutgoingMessage.identityVerifiedMessage(recipient, 3000L), threadId = call1.threadId)
+    val identity2Id = MmsHelper.insert(message = OutgoingMessage.identityVerifiedMessage(recipient, 4000L), threadId = call1.threadId)
+
+    message.deleteMessage(call1.messageId, call1.threadId)
+
+    val msgCall2 = message.getMessageRecord(call2.messageId)
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall2.collapsedState)
+    assertEquals(call2.messageId, msgCall2.collapsedHeadId)
+
+    val msgIdentity1 = message.getMessageRecord(identity1Id)
+    val msgIdentity2 = message.getMessageRecord(identity2Id)
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgIdentity1.collapsedState)
+    assertEquals(identity1Id, msgIdentity1.collapsedHeadId)
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msgIdentity2.collapsedState)
+    assertEquals(identity1Id, msgIdentity2.collapsedHeadId)
+  }
+
+  @Test
+  fun givenPendingCollapsingEvents_whenIMarkSeenAtASpecificTime_thenEverythingBeforeThatTimeIsCollapsed() {
+    val call1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false)
+    val call2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false)
+
+    message.collapsePendingCollapsibleEvents(aliceThread, System.currentTimeMillis())
+
+    val call3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false)
+
+    val msgCall1 = message.getMessageRecord(call1.messageId)
+    val msgCall2 = message.getMessageRecord(call2.messageId)
+    val msgCall3 = message.getMessageRecord(call3.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall1.collapsedState)
+    assertEquals(CollapsedState.COLLAPSED, msgCall2.collapsedState)
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msgCall3.collapsedState)
+  }
+
+  @Test
+  fun givenPendingCollapsingEvents_whenIMarkAllAsSeen_thenEverythingIsCollapsed() {
+    val call1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false)
+    val call2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false)
+
+    message.collapseAllPendingCollapsibleEvents()
+
+    val call3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false)
+
+    val msgCall1 = message.getMessageRecord(call1.messageId)
+    val msgCall2 = message.getMessageRecord(call2.messageId)
+    val msgCall3 = message.getMessageRecord(call3.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall1.collapsedState)
+    assertEquals(CollapsedState.COLLAPSED, msgCall2.collapsedState)
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msgCall3.collapsedState)
+  }
+
+  @Test
+  fun givenCollapsedEvents_whenITrimTheThreadByCount_thenIExpectANewHead() {
+    val call1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false)
+    val call2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false)
+    val call3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false)
+    val call4 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 4000L, false)
+
+    val msgCall1 = message.getMessageRecord(call1.messageId)
+    val msgCall2 = message.getMessageRecord(call2.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall1.collapsedState)
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msgCall2.collapsedState)
+
+    thread.trimThread(threadId = aliceThread, syncThreadTrimDeletes = false, length = 2)
+
+    val msgCall3 = message.getMessageRecord(call3.messageId)
+    val msgCall4 = message.getMessageRecord(call4.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall3.collapsedState)
+    assertEquals(CollapsedState.PENDING_COLLAPSED, msgCall4.collapsedState)
+    assertEquals(call3.messageId, msgCall4.collapsedHeadId)
+  }
+
+  @Test
+  fun givenCollapsedEvents_whenITrimTheThreadByDate_thenIExpectANewHead() {
+    val call1 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 1000L, false)
+    val call2 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 2000L, false)
+    val trimBeforeDate = System.currentTimeMillis()
+    val call3 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 3000L, false)
+    val call4 = message.insertCallLog(alice, MessageTypes.INCOMING_AUDIO_CALL_TYPE, 4000L, false)
+
+    message.collapsePendingCollapsibleEvents(aliceThread, System.currentTimeMillis())
+
+    val msgCall1 = message.getMessageRecord(call1.messageId)
+    val msgCall2 = message.getMessageRecord(call2.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall1.collapsedState)
+    assertEquals(CollapsedState.COLLAPSED, msgCall2.collapsedState)
+
+    thread.trimThread(threadId = aliceThread, syncThreadTrimDeletes = false, trimBeforeDate = trimBeforeDate)
+
+    val msgCall3 = message.getMessageRecord(call3.messageId)
+    val msgCall4 = message.getMessageRecord(call4.messageId)
+
+    assertEquals(CollapsedState.HEAD_COLLAPSED, msgCall3.collapsedState)
+    assertEquals(CollapsedState.COLLAPSED, msgCall4.collapsedState)
+    assertEquals(call3.messageId, msgCall4.collapsedHeadId)
+  }
+}

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

@@ -1,541 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import android.app.Application
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import net.zetetic.database.sqlcipher.SQLiteDatabase
-import net.zetetic.database.sqlcipher.SQLiteOpenHelper
-import org.junit.Assert.assertTrue
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.ForeignKeyConstraint
-import org.signal.core.util.Index
-import org.signal.core.util.getForeignKeys
-import org.signal.core.util.getIndexes
-import org.signal.core.util.readToList
-import org.signal.core.util.requireNonNullString
-import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSQLiteDatabase
-
-/**
- * A test that guarantees that a freshly-created database looks the same as one that went through the upgrade path.
- */
-@RunWith(AndroidJUnit4::class)
-class DatabaseConsistencyTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @Test
-  fun testUpgradeConsistency() {
-    val currentVersionStatements = SignalDatabase.rawDatabase.getAllCreateStatements()
-    val testHelper = InMemoryTestHelper(AppDependencies.application).also {
-      it.onUpgrade(it.writableDatabase, 181, SignalDatabaseMigrations.DATABASE_VERSION)
-    }
-
-    val upgradedStatements = testHelper.readableDatabase.getAllCreateStatements()
-
-    if (currentVersionStatements != upgradedStatements) {
-      var message = "\n"
-
-      val currentByName = currentVersionStatements.associateBy { it.name }
-      val upgradedByName = upgradedStatements.associateBy { it.name }
-
-      if (currentByName.keys != upgradedByName.keys) {
-        val exclusiveToCurrent = currentByName.keys - upgradedByName.keys
-        val exclusiveToUpgrade = upgradedByName.keys - currentByName.keys
-
-        message += "SQL entities exclusive to the newly-created database: $exclusiveToCurrent\n"
-        message += "SQL entities exclusive to the upgraded database: $exclusiveToUpgrade\n\n"
-      } else {
-        for (currentEntry in currentByName) {
-          val upgradedValue: Statement = upgradedByName[currentEntry.key]!!
-          if (upgradedValue.sql != currentEntry.value.sql) {
-            message += "Statement differed:\n"
-            message += "newly-created:\n"
-            message += "${currentEntry.value.sql}\n\n"
-            message += "upgraded:\n"
-            message += "${upgradedValue.sql}\n\n"
-          }
-        }
-      }
-
-      assertTrue(message, false)
-    }
-  }
-
-  @Test
-  fun testForeignKeyIndexCoverage() {
-    /** We may deem certain indexes non-critical if deletion frequency is low or table size is small. */
-    val ignoredColumns: List<Pair<String, String>> = listOf(
-      StorySendTable.TABLE_NAME to StorySendTable.DISTRIBUTION_ID
-    )
-
-    val foreignKeys: List<ForeignKeyConstraint> = SignalDatabase.rawDatabase.getForeignKeys()
-    val indexesByFirstColumn: List<Index> = SignalDatabase.rawDatabase.getIndexes()
-
-    val notFound: List<Pair<String, String>> = foreignKeys
-      .filterNot { ignoredColumns.contains(it.table to it.column) }
-      .filterNot { foreignKey ->
-        indexesByFirstColumn.hasPrimaryIndexFor(foreignKey.table, foreignKey.column)
-      }
-      .map { it.table to it.column }
-
-    assertTrue("Missing indexes to cover: $notFound", notFound.isEmpty())
-  }
-
-  private fun List<Index>.hasPrimaryIndexFor(table: String, column: String): Boolean {
-    return this.any { index -> index.table == table && index.columns[0] == column }
-  }
-
-  private data class Statement(
-    val name: String,
-    val sql: String
-  )
-
-  private fun SQLiteDatabase.getAllCreateStatements(): List<Statement> {
-    return this.rawQuery("SELECT name, sql FROM sqlite_schema WHERE sql NOT NULL AND name != 'sqlite_sequence'")
-      .readToList { cursor ->
-        Statement(
-          name = cursor.requireNonNullString("name"),
-          sql = cursor.requireNonNullString("sql").normalizeSql()
-        )
-      }
-      .filterNot { it.name.startsWith("sqlite_stat") }
-      .sortedBy { it.name }
-  }
-
-  private fun String.normalizeSql(): String {
-    return this
-      .split("\n")
-      .map { it.trim() }
-      .joinToString(separator = " ")
-      .replace(Regex.fromLiteral(" ,"), ",")
-      .replace(",([^\\s])".toRegex(), ", $1")
-      .replace(Regex("\\s+"), " ")
-      .replace(Regex.fromLiteral("( "), "(")
-      .replace(Regex.fromLiteral(" )"), ")")
-      .replace(Regex("CREATE TABLE \"([a-zA-Z_]+)\""), "CREATE TABLE $1") // for some reason SQLite will wrap table names in quotes for upgraded tables. This unwraps them.
-  }
-
-  private class InMemoryTestHelper(private val application: Application) : SQLiteOpenHelper(application, null, null, 1) {
-
-    override fun onCreate(db: SQLiteDatabase) {
-      for (statement in SNAPSHOT_V181) {
-        db.execSQL(statement.sql)
-      }
-    }
-
-    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-      SignalDatabaseMigrations.migrate(application, SignalSQLiteDatabase(db), 181, SignalDatabaseMigrations.DATABASE_VERSION)
-    }
-
-    /**
-     * This is the list of statements that existed at version 181. Never change this.
-     */
-    private val SNAPSHOT_V181 = listOf(
-      Statement(
-        name = "message",
-        sql = "CREATE TABLE message (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        date_sent INTEGER NOT NULL,\n        date_received INTEGER NOT NULL,\n        date_server INTEGER DEFAULT -1,\n        thread_id INTEGER NOT NULL REFERENCES thread (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        recipient_device_id INTEGER,\n        type INTEGER NOT NULL,\n        body TEXT,\n        read INTEGER DEFAULT 0,\n        ct_l TEXT,\n        exp INTEGER,\n        m_type INTEGER,\n        m_size INTEGER,\n        st INTEGER,\n        tr_id TEXT,\n        subscription_id INTEGER DEFAULT -1, \n        receipt_timestamp INTEGER DEFAULT -1, \n        delivery_receipt_count INTEGER DEFAULT 0, \n        read_receipt_count INTEGER DEFAULT 0, \n        viewed_receipt_count INTEGER DEFAULT 0,\n        mismatched_identities TEXT DEFAULT NULL,\n        network_failures TEXT DEFAULT NULL,\n        expires_in INTEGER DEFAULT 0,\n        expire_started INTEGER DEFAULT 0,\n        notified INTEGER DEFAULT 0,\n        quote_id INTEGER DEFAULT 0,\n        quote_author INTEGER DEFAULT 0,\n        quote_body TEXT DEFAULT NULL,\n        quote_missing INTEGER DEFAULT 0,\n        quote_mentions BLOB DEFAULT NULL,\n        quote_type INTEGER DEFAULT 0,\n        shared_contacts TEXT DEFAULT NULL,\n        unidentified INTEGER DEFAULT 0,\n        link_previews TEXT DEFAULT NULL,\n        view_once INTEGER DEFAULT 0,\n        reactions_unread INTEGER DEFAULT 0,\n        reactions_last_seen INTEGER DEFAULT -1,\n        remote_deleted INTEGER DEFAULT 0,\n        mentions_self INTEGER DEFAULT 0,\n        notified_timestamp INTEGER DEFAULT 0,\n        server_guid TEXT DEFAULT NULL,\n        message_ranges BLOB DEFAULT NULL,\n        story_type INTEGER DEFAULT 0,\n        parent_story_id INTEGER DEFAULT 0,\n        export_state BLOB DEFAULT NULL,\n        exported INTEGER DEFAULT 0,\n        scheduled_date INTEGER DEFAULT -1\n      )"
-      ),
-      Statement(
-        name = "part",
-        sql = "CREATE TABLE part (_id INTEGER PRIMARY KEY, mid INTEGER, seq INTEGER DEFAULT 0, ct TEXT, name TEXT, chset INTEGER, cd TEXT, fn TEXT, cid TEXT, cl TEXT, ctt_s INTEGER, ctt_t TEXT, encrypted INTEGER, pending_push INTEGER, _data TEXT, data_size INTEGER, file_name TEXT, unique_id INTEGER NOT NULL, digest BLOB, fast_preflight_id TEXT, voice_note INTEGER DEFAULT 0, borderless INTEGER DEFAULT 0, video_gif INTEGER DEFAULT 0, data_random BLOB, quote INTEGER DEFAULT 0, width INTEGER DEFAULT 0, height INTEGER DEFAULT 0, caption TEXT DEFAULT NULL, sticker_pack_id TEXT DEFAULT NULL, sticker_pack_key DEFAULT NULL, sticker_id INTEGER DEFAULT -1, sticker_emoji STRING DEFAULT NULL, data_hash TEXT DEFAULT NULL, blur_hash TEXT DEFAULT NULL, transform_properties TEXT DEFAULT NULL, transfer_file TEXT DEFAULT NULL, display_order INTEGER DEFAULT 0, upload_timestamp INTEGER DEFAULT 0, cdn_number INTEGER DEFAULT 0)"
-      ),
-      Statement(
-        name = "thread",
-        sql = "CREATE TABLE thread (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT, \n  date INTEGER DEFAULT 0, \n  meaningful_messages INTEGER DEFAULT 0,\n  recipient_id INTEGER NOT NULL UNIQUE REFERENCES recipient (_id) ON DELETE CASCADE,\n  read INTEGER DEFAULT 1, \n  type INTEGER DEFAULT 0, \n  error INTEGER DEFAULT 0, \n  snippet TEXT, \n  snippet_type INTEGER DEFAULT 0, \n  snippet_uri TEXT DEFAULT NULL, \n  snippet_content_type TEXT DEFAULT NULL, \n  snippet_extras TEXT DEFAULT NULL, \n  unread_count INTEGER DEFAULT 0, \n  archived INTEGER DEFAULT 0, \n  status INTEGER DEFAULT 0, \n  delivery_receipt_count INTEGER DEFAULT 0, \n  read_receipt_count INTEGER DEFAULT 0, \n  expires_in INTEGER DEFAULT 0, \n  last_seen INTEGER DEFAULT 0, \n  has_sent INTEGER DEFAULT 0, \n  last_scrolled INTEGER DEFAULT 0, \n  pinned INTEGER DEFAULT 0, \n  unread_self_mention_count INTEGER DEFAULT 0\n)"
-      ),
-      Statement(
-        name = "identities",
-        sql = "CREATE TABLE identities (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address INTEGER UNIQUE, \n        identity_key TEXT, \n        first_use INTEGER DEFAULT 0, \n        timestamp INTEGER DEFAULT 0, \n        verified INTEGER DEFAULT 0, \n        nonblocking_approval INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "drafts",
-        sql = "CREATE TABLE drafts (\n        _id INTEGER PRIMARY KEY, \n        thread_id INTEGER, \n        type TEXT, \n        value TEXT\n      )"
-      ),
-      Statement(
-        name = "push",
-        sql = "CREATE TABLE push (_id INTEGER PRIMARY KEY, type INTEGER, source TEXT, source_uuid TEXT, device_id INTEGER, body TEXT, content TEXT, timestamp INTEGER, server_timestamp INTEGER DEFAULT 0, server_delivered_timestamp INTEGER DEFAULT 0, server_guid TEXT DEFAULT NULL)"
-      ),
-      Statement(
-        name = "groups",
-        sql = "CREATE TABLE groups (\n        _id INTEGER PRIMARY KEY, \n        group_id TEXT, \n        recipient_id INTEGER,\n        title TEXT,\n        avatar_id INTEGER, \n        avatar_key BLOB,\n        avatar_content_type TEXT, \n        avatar_relay TEXT,\n        timestamp INTEGER,\n        active INTEGER DEFAULT 1,\n        avatar_digest BLOB, \n        mms INTEGER DEFAULT 0, \n        master_key BLOB, \n        revision BLOB, \n        decrypted_group BLOB, \n        expected_v2_id TEXT DEFAULT NULL, \n        former_v1_members TEXT DEFAULT NULL, \n        distribution_id TEXT DEFAULT NULL, \n        display_as_story INTEGER DEFAULT 0, \n        auth_service_id TEXT DEFAULT NULL, \n        last_force_update_timestamp INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "group_membership",
-        sql = "CREATE TABLE group_membership (     _id INTEGER PRIMARY KEY,     group_id TEXT NOT NULL,     recipient_id INTEGER NOT NULL,     UNIQUE(group_id, recipient_id) )"
-      ),
-      Statement(
-        name = "recipient",
-        sql = "CREATE TABLE recipient (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  uuid TEXT UNIQUE DEFAULT NULL,\n  username TEXT UNIQUE DEFAULT NULL,\n  phone TEXT UNIQUE DEFAULT NULL,\n  email TEXT UNIQUE DEFAULT NULL,\n  group_id TEXT UNIQUE DEFAULT NULL,\n  group_type INTEGER DEFAULT 0,\n  blocked INTEGER DEFAULT 0,\n  message_ringtone TEXT DEFAULT NULL, \n  message_vibrate INTEGER DEFAULT 0, \n  call_ringtone TEXT DEFAULT NULL, \n  call_vibrate INTEGER DEFAULT 0, \n  notification_channel TEXT DEFAULT NULL, \n  mute_until INTEGER DEFAULT 0, \n  color TEXT DEFAULT NULL, \n  seen_invite_reminder INTEGER DEFAULT 0,\n  default_subscription_id INTEGER DEFAULT -1,\n  message_expiration_time INTEGER DEFAULT 0,\n  registered INTEGER DEFAULT 0,\n  system_given_name TEXT DEFAULT NULL, \n  system_family_name TEXT DEFAULT NULL, \n  system_display_name TEXT DEFAULT NULL, \n  system_photo_uri TEXT DEFAULT NULL, \n  system_phone_label TEXT DEFAULT NULL, \n  system_phone_type INTEGER DEFAULT -1, \n  system_contact_uri TEXT DEFAULT NULL, \n  system_info_pending INTEGER DEFAULT 0, \n  profile_key TEXT DEFAULT NULL, \n  profile_key_credential TEXT DEFAULT NULL, \n  signal_profile_name TEXT DEFAULT NULL, \n  profile_family_name TEXT DEFAULT NULL, \n  profile_joined_name TEXT DEFAULT NULL, \n  signal_profile_avatar TEXT DEFAULT NULL, \n  profile_sharing INTEGER DEFAULT 0, \n  last_profile_fetch INTEGER DEFAULT 0, \n  unidentified_access_mode INTEGER DEFAULT 0, \n  force_sms_selection INTEGER DEFAULT 0, \n  storage_service_key TEXT UNIQUE DEFAULT NULL, \n  mention_setting INTEGER DEFAULT 0, \n  storage_proto TEXT DEFAULT NULL,\n  capabilities INTEGER DEFAULT 0,\n  last_session_reset BLOB DEFAULT NULL,\n  wallpaper BLOB DEFAULT NULL,\n  wallpaper_file TEXT DEFAULT NULL,\n  about TEXT DEFAULT NULL,\n  about_emoji TEXT DEFAULT NULL,\n  extras BLOB DEFAULT NULL,\n  groups_in_common INTEGER DEFAULT 0,\n  chat_colors BLOB DEFAULT NULL,\n  custom_chat_colors_id INTEGER DEFAULT 0,\n  badges BLOB DEFAULT NULL,\n  pni TEXT DEFAULT NULL,\n  distribution_list_id INTEGER DEFAULT NULL,\n  needs_pni_signature INTEGER DEFAULT 0,\n  unregistered_timestamp INTEGER DEFAULT 0,\n  hidden INTEGER DEFAULT 0,\n  reporting_token BLOB DEFAULT NULL,\n  system_nickname TEXT DEFAULT NULL\n)"
-      ),
-      Statement(
-        name = "group_receipts",
-        sql = "CREATE TABLE group_receipts (\n        _id INTEGER PRIMARY KEY, \n        mms_id INTEGER, \n        address INTEGER, \n        status INTEGER, \n        timestamp INTEGER, \n        unidentified INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "one_time_prekeys",
-        sql = "CREATE TABLE one_time_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL, \n        private_key TEXT NOT NULL,\n        UNIQUE(account_id, key_id)\n      )"
-      ),
-      Statement(
-        name = "signed_prekeys",
-        sql = "CREATE TABLE signed_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL,\n        private_key TEXT NOT NULL,\n        signature TEXT NOT NULL, \n        timestamp INTEGER DEFAULT 0,\n        UNIQUE(account_id, key_id)\n    )"
-      ),
-      Statement(
-        name = "sessions",
-        sql = "CREATE TABLE sessions (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        account_id TEXT NOT NULL,\n        address TEXT NOT NULL,\n        device INTEGER NOT NULL,\n        record BLOB NOT NULL,\n        UNIQUE(account_id, address, device)\n      )"
-      ),
-      Statement(
-        name = "sender_keys",
-        sql = "CREATE TABLE sender_keys (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        distribution_id TEXT NOT NULL,\n        record BLOB NOT NULL, \n        created_at INTEGER NOT NULL, \n        UNIQUE(address,device, distribution_id) ON CONFLICT REPLACE\n      )"
-      ),
-      Statement(
-        name = "sender_key_shared",
-        sql = "CREATE TABLE sender_key_shared (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        distribution_id TEXT NOT NULL, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        timestamp INTEGER DEFAULT 0, \n        UNIQUE(distribution_id,address, device) ON CONFLICT REPLACE\n      )"
-      ),
-      Statement(
-        name = "pending_retry_receipts",
-        sql = "CREATE TABLE pending_retry_receipts(_id INTEGER PRIMARY KEY AUTOINCREMENT, author TEXT NOT NULL, device INTEGER NOT NULL, sent_timestamp INTEGER NOT NULL, received_timestamp TEXT NOT NULL, thread_id INTEGER NOT NULL, UNIQUE(author,sent_timestamp) ON CONFLICT REPLACE)"
-      ),
-      Statement(
-        name = "sticker",
-        sql = "CREATE TABLE sticker (_id INTEGER PRIMARY KEY AUTOINCREMENT, pack_id TEXT NOT NULL, pack_key TEXT NOT NULL, pack_title TEXT NOT NULL, pack_author TEXT NOT NULL, sticker_id INTEGER, cover INTEGER, pack_order INTEGER, emoji TEXT NOT NULL, content_type TEXT DEFAULT NULL, last_used INTEGER, installed INTEGER,file_path TEXT NOT NULL, file_length INTEGER, file_random BLOB, UNIQUE(pack_id, sticker_id, cover) ON CONFLICT IGNORE)"
-      ),
-      Statement(
-        name = "storage_key",
-        sql = "CREATE TABLE storage_key (_id INTEGER PRIMARY KEY AUTOINCREMENT, type INTEGER, key TEXT UNIQUE)"
-      ),
-      Statement(
-        name = "mention",
-        sql = "CREATE TABLE mention(_id INTEGER PRIMARY KEY AUTOINCREMENT, thread_id INTEGER, message_id INTEGER, recipient_id INTEGER, range_start INTEGER, range_length INTEGER)"
-      ),
-      Statement(
-        name = "payments",
-        sql = "CREATE TABLE payments(_id INTEGER PRIMARY KEY, uuid TEXT DEFAULT NULL, recipient INTEGER DEFAULT 0, recipient_address TEXT DEFAULT NULL, timestamp INTEGER, note TEXT DEFAULT NULL, direction INTEGER, state INTEGER, failure_reason INTEGER, amount BLOB NOT NULL, fee BLOB NOT NULL, transaction_record BLOB DEFAULT NULL, receipt BLOB DEFAULT NULL, payment_metadata BLOB DEFAULT NULL, receipt_public_key TEXT DEFAULT NULL, block_index INTEGER DEFAULT 0, block_timestamp INTEGER DEFAULT 0, seen INTEGER, UNIQUE(uuid) ON CONFLICT ABORT)"
-      ),
-      Statement(
-        name = "chat_colors",
-        sql = "CREATE TABLE chat_colors (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  chat_colors BLOB\n)"
-      ),
-      Statement(
-        name = "emoji_search",
-        sql = "CREATE TABLE emoji_search (\n        _id INTEGER PRIMARY KEY,\n        label TEXT NOT NULL,\n        emoji TEXT NOT NULL,\n        rank INTEGER DEFAULT 2147483647 \n      )"
-      ),
-      Statement(
-        name = "avatar_picker",
-        sql = "CREATE TABLE avatar_picker (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  last_used INTEGER DEFAULT 0,\n  group_id TEXT DEFAULT NULL,\n  avatar BLOB NOT NULL\n)"
-      ),
-      Statement(
-        name = "group_call_ring",
-        sql = "CREATE TABLE group_call_ring (\n  _id INTEGER PRIMARY KEY,\n  ring_id INTEGER UNIQUE,\n  date_received INTEGER,\n  ring_state INTEGER\n)"
-      ),
-      Statement(
-        name = "reaction",
-        sql = "CREATE TABLE reaction (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  author_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  emoji TEXT NOT NULL,\n  date_sent INTEGER NOT NULL,\n  date_received INTEGER NOT NULL,\n  UNIQUE(message_id, author_id) ON CONFLICT REPLACE\n)"
-      ),
-      Statement(
-        name = "donation_receipt",
-        sql = "CREATE TABLE donation_receipt (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  receipt_type TEXT NOT NULL,\n  receipt_date INTEGER NOT NULL,\n  amount TEXT NOT NULL,\n  currency TEXT NOT NULL,\n  subscription_level INTEGER NOT NULL\n)"
-      ),
-      Statement(
-        name = "story_sends",
-        sql = "CREATE TABLE story_sends (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  sent_timestamp INTEGER NOT NULL,\n  allows_replies INTEGER NOT NULL,\n  distribution_id TEXT NOT NULL REFERENCES distribution_list (distribution_id) ON DELETE CASCADE\n)"
-      ),
-      Statement(
-        name = "cds",
-        sql = "CREATE TABLE cds (\n        _id INTEGER PRIMARY KEY,\n        e164 TEXT NOT NULL UNIQUE ON CONFLICT IGNORE,\n        last_seen_at INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "remote_megaphone",
-        sql = "CREATE TABLE remote_megaphone (\n  _id INTEGER PRIMARY KEY,\n  uuid TEXT UNIQUE NOT NULL,\n  priority INTEGER NOT NULL,\n  countries TEXT,\n  minimum_version INTEGER NOT NULL,\n  dont_show_before INTEGER NOT NULL,\n  dont_show_after INTEGER NOT NULL,\n  show_for_days INTEGER NOT NULL,\n  conditional_id TEXT,\n  primary_action_id TEXT,\n  secondary_action_id TEXT,\n  image_url TEXT,\n  image_uri TEXT DEFAULT NULL,\n  title TEXT NOT NULL,\n  body TEXT NOT NULL,\n  primary_action_text TEXT,\n  secondary_action_text TEXT,\n  shown_at INTEGER DEFAULT 0,\n  finished_at INTEGER DEFAULT 0,\n  primary_action_data TEXT DEFAULT NULL,\n  secondary_action_data TEXT DEFAULT NULL,\n  snoozed_at INTEGER DEFAULT 0,\n  seen_count INTEGER DEFAULT 0\n)"
-      ),
-      Statement(
-        name = "pending_pni_signature_message",
-        sql = "CREATE TABLE pending_pni_signature_message (\n        _id INTEGER PRIMARY KEY,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        sent_timestamp INTEGER NOT NULL,\n        device_id INTEGER NOT NULL\n      )"
-      ),
-      Statement(
-        name = "call",
-        sql = "CREATE TABLE call (\n  _id INTEGER PRIMARY KEY,\n  call_id INTEGER NOT NULL UNIQUE,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  peer INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  type INTEGER NOT NULL,\n  direction INTEGER NOT NULL,\n  event INTEGER NOT NULL\n)"
-      ),
-      Statement(
-        name = "message_fts",
-        sql = "CREATE VIRTUAL TABLE message_fts USING fts5(body, thread_id UNINDEXED, content=message, content_rowid=_id)"
-      ),
-      Statement(
-        name = "remapped_recipients",
-        sql = "CREATE TABLE remapped_recipients (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
-      ),
-      Statement(
-        name = "remapped_threads",
-        sql = "CREATE TABLE remapped_threads (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
-      ),
-      Statement(
-        name = "msl_payload",
-        sql = "CREATE TABLE msl_payload (\n        _id INTEGER PRIMARY KEY,\n        date_sent INTEGER NOT NULL,\n        content BLOB NOT NULL,\n        content_hint INTEGER NOT NULL,\n        urgent INTEGER NOT NULL DEFAULT 1\n      )"
-      ),
-      Statement(
-        name = "msl_recipient",
-        sql = "CREATE TABLE msl_recipient (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL, \n        device INTEGER NOT NULL\n      )"
-      ),
-      Statement(
-        name = "msl_message",
-        sql = "CREATE TABLE msl_message (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        message_id INTEGER NOT NULL\n      )"
-      ),
-      Statement(
-        name = "notification_profile",
-        sql = "CREATE TABLE notification_profile (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  name TEXT NOT NULL UNIQUE,\n  emoji TEXT NOT NULL,\n  color TEXT NOT NULL,\n  created_at INTEGER NOT NULL,\n  allow_all_calls INTEGER NOT NULL DEFAULT 0,\n  allow_all_mentions INTEGER NOT NULL DEFAULT 0\n)"
-      ),
-      Statement(
-        name = "notification_profile_schedule",
-        sql = "CREATE TABLE notification_profile_schedule (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  enabled INTEGER NOT NULL DEFAULT 0,\n  start INTEGER NOT NULL,\n  end INTEGER NOT NULL,\n  days_enabled TEXT NOT NULL\n)"
-      ),
-      Statement(
-        name = "notification_profile_allowed_members",
-        sql = "CREATE TABLE notification_profile_allowed_members (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL,\n  UNIQUE(notification_profile_id, recipient_id) ON CONFLICT REPLACE\n)"
-      ),
-      Statement(
-        name = "distribution_list",
-        sql = "CREATE TABLE distribution_list (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        name TEXT UNIQUE NOT NULL,\n        distribution_id TEXT UNIQUE NOT NULL,\n        recipient_id INTEGER UNIQUE REFERENCES recipient (_id),\n        allows_replies INTEGER DEFAULT 1,\n        deletion_timestamp INTEGER DEFAULT 0,\n        is_unknown INTEGER DEFAULT 0,\n        privacy_mode INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "distribution_list_member",
-        sql = "CREATE TABLE distribution_list_member (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        list_id INTEGER NOT NULL REFERENCES distribution_list (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id),\n        privacy_mode INTEGER DEFAULT 0\n      )"
-      ),
-      Statement(
-        name = "recipient_group_type_index",
-        sql = "CREATE INDEX recipient_group_type_index ON recipient (group_type)"
-      ),
-      Statement(
-        name = "recipient_pni_index",
-        sql = "CREATE UNIQUE INDEX recipient_pni_index ON recipient (pni)"
-      ),
-      Statement(
-        name = "recipient_service_id_profile_key",
-        sql = "CREATE INDEX recipient_service_id_profile_key ON recipient (uuid, profile_key) WHERE uuid NOT NULL AND profile_key NOT NULL"
-      ),
-      Statement(
-        name = "mms_read_and_notified_and_thread_id_index",
-        sql = "CREATE INDEX mms_read_and_notified_and_thread_id_index ON message (read, notified, thread_id)"
-      ),
-      Statement(
-        name = "mms_type_index",
-        sql = "CREATE INDEX mms_type_index ON message (type)"
-      ),
-      Statement(
-        name = "mms_date_sent_index",
-        sql = "CREATE INDEX mms_date_sent_index ON message (date_sent, recipient_id, thread_id)"
-      ),
-      Statement(
-        name = "mms_date_server_index",
-        sql = "CREATE INDEX mms_date_server_index ON message (date_server)"
-      ),
-      Statement(
-        name = "mms_thread_date_index",
-        sql = "CREATE INDEX mms_thread_date_index ON message (thread_id, date_received)"
-      ),
-      Statement(
-        name = "mms_reactions_unread_index",
-        sql = "CREATE INDEX mms_reactions_unread_index ON message (reactions_unread)"
-      ),
-      Statement(
-        name = "mms_story_type_index",
-        sql = "CREATE INDEX mms_story_type_index ON message (story_type)"
-      ),
-      Statement(
-        name = "mms_parent_story_id_index",
-        sql = "CREATE INDEX mms_parent_story_id_index ON message (parent_story_id)"
-      ),
-      Statement(
-        name = "mms_thread_story_parent_story_scheduled_date_index",
-        sql = "CREATE INDEX mms_thread_story_parent_story_scheduled_date_index ON message (thread_id, date_received, story_type, parent_story_id, scheduled_date)"
-      ),
-      Statement(
-        name = "message_quote_id_quote_author_scheduled_date_index",
-        sql = "CREATE INDEX message_quote_id_quote_author_scheduled_date_index ON message (quote_id, quote_author, scheduled_date)"
-      ),
-      Statement(
-        name = "mms_exported_index",
-        sql = "CREATE INDEX mms_exported_index ON message (exported)"
-      ),
-      Statement(
-        name = "mms_id_type_payment_transactions_index",
-        sql = "CREATE INDEX mms_id_type_payment_transactions_index ON message (_id,type) WHERE type & 12884901888 != 0"
-      ),
-      Statement(
-        name = "part_mms_id_index",
-        sql = "CREATE INDEX part_mms_id_index ON part (mid)"
-      ),
-      Statement(
-        name = "pending_push_index",
-        sql = "CREATE INDEX pending_push_index ON part (pending_push)"
-      ),
-      Statement(
-        name = "part_sticker_pack_id_index",
-        sql = "CREATE INDEX part_sticker_pack_id_index ON part (sticker_pack_id)"
-      ),
-      Statement(
-        name = "part_data_hash_index",
-        sql = "CREATE INDEX part_data_hash_index ON part (data_hash)"
-      ),
-      Statement(
-        name = "part_data_index",
-        sql = "CREATE INDEX part_data_index ON part (_data)"
-      ),
-      Statement(
-        name = "thread_recipient_id_index",
-        sql = "CREATE INDEX thread_recipient_id_index ON thread (recipient_id)"
-      ),
-      Statement(
-        name = "archived_count_index",
-        sql = "CREATE INDEX archived_count_index ON thread (archived, meaningful_messages)"
-      ),
-      Statement(
-        name = "thread_pinned_index",
-        sql = "CREATE INDEX thread_pinned_index ON thread (pinned)"
-      ),
-      Statement(
-        name = "thread_read",
-        sql = "CREATE INDEX thread_read ON thread (read)"
-      ),
-      Statement(
-        name = "draft_thread_index",
-        sql = "CREATE INDEX draft_thread_index ON drafts (thread_id)"
-      ),
-      Statement(
-        name = "group_id_index",
-        sql = "CREATE UNIQUE INDEX group_id_index ON groups (group_id)"
-      ),
-      Statement(
-        name = "group_recipient_id_index",
-        sql = "CREATE UNIQUE INDEX group_recipient_id_index ON groups (recipient_id)"
-      ),
-      Statement(
-        name = "expected_v2_id_index",
-        sql = "CREATE UNIQUE INDEX expected_v2_id_index ON groups (expected_v2_id)"
-      ),
-      Statement(
-        name = "group_distribution_id_index",
-        sql = "CREATE UNIQUE INDEX group_distribution_id_index ON groups(distribution_id)"
-      ),
-      Statement(
-        name = "group_receipt_mms_id_index",
-        sql = "CREATE INDEX group_receipt_mms_id_index ON group_receipts (mms_id)"
-      ),
-      Statement(
-        name = "sticker_pack_id_index",
-        sql = "CREATE INDEX sticker_pack_id_index ON sticker (pack_id)"
-      ),
-      Statement(
-        name = "sticker_sticker_id_index",
-        sql = "CREATE INDEX sticker_sticker_id_index ON sticker (sticker_id)"
-      ),
-      Statement(
-        name = "storage_key_type_index",
-        sql = "CREATE INDEX storage_key_type_index ON storage_key (type)"
-      ),
-      Statement(
-        name = "mention_message_id_index",
-        sql = "CREATE INDEX mention_message_id_index ON mention (message_id)"
-      ),
-      Statement(
-        name = "mention_recipient_id_thread_id_index",
-        sql = "CREATE INDEX mention_recipient_id_thread_id_index ON mention (recipient_id, thread_id)"
-      ),
-      Statement(
-        name = "timestamp_direction_index",
-        sql = "CREATE INDEX timestamp_direction_index ON payments (timestamp, direction)"
-      ),
-      Statement(
-        name = "timestamp_index",
-        sql = "CREATE INDEX timestamp_index ON payments (timestamp)"
-      ),
-      Statement(
-        name = "receipt_public_key_index",
-        sql = "CREATE UNIQUE INDEX receipt_public_key_index ON payments (receipt_public_key)"
-      ),
-      Statement(
-        name = "msl_payload_date_sent_index",
-        sql = "CREATE INDEX msl_payload_date_sent_index ON msl_payload (date_sent)"
-      ),
-      Statement(
-        name = "msl_recipient_recipient_index",
-        sql = "CREATE INDEX msl_recipient_recipient_index ON msl_recipient (recipient_id, device, payload_id)"
-      ),
-      Statement(
-        name = "msl_recipient_payload_index",
-        sql = "CREATE INDEX msl_recipient_payload_index ON msl_recipient (payload_id)"
-      ),
-      Statement(
-        name = "msl_message_message_index",
-        sql = "CREATE INDEX msl_message_message_index ON msl_message (message_id, payload_id)"
-      ),
-      Statement(
-        name = "date_received_index",
-        sql = "CREATE INDEX date_received_index on group_call_ring (date_received)"
-      ),
-      Statement(
-        name = "notification_profile_schedule_profile_index",
-        sql = "CREATE INDEX notification_profile_schedule_profile_index ON notification_profile_schedule (notification_profile_id)"
-      ),
-      Statement(
-        name = "notification_profile_allowed_members_profile_index",
-        sql = "CREATE INDEX notification_profile_allowed_members_profile_index ON notification_profile_allowed_members (notification_profile_id)"
-      ),
-      Statement(
-        name = "donation_receipt_type_index",
-        sql = "CREATE INDEX donation_receipt_type_index ON donation_receipt (receipt_type)"
-      ),
-      Statement(
-        name = "donation_receipt_date_index",
-        sql = "CREATE INDEX donation_receipt_date_index ON donation_receipt (receipt_date)"
-      ),
-      Statement(
-        name = "story_sends_recipient_id_sent_timestamp_allows_replies_index",
-        sql = "CREATE INDEX story_sends_recipient_id_sent_timestamp_allows_replies_index ON story_sends (recipient_id, sent_timestamp, allows_replies)"
-      ),
-      Statement(
-        name = "story_sends_message_id_distribution_id_index",
-        sql = "CREATE INDEX story_sends_message_id_distribution_id_index ON story_sends (message_id, distribution_id)"
-      ),
-      Statement(
-        name = "distribution_list_member_list_id_recipient_id_privacy_mode_index",
-        sql = "CREATE UNIQUE INDEX distribution_list_member_list_id_recipient_id_privacy_mode_index ON distribution_list_member (list_id, recipient_id, privacy_mode)"
-      ),
-      Statement(
-        name = "pending_pni_recipient_sent_device_index",
-        sql = "CREATE UNIQUE INDEX pending_pni_recipient_sent_device_index ON pending_pni_signature_message (recipient_id, sent_timestamp, device_id)"
-      ),
-      Statement(
-        name = "call_call_id_index",
-        sql = "CREATE INDEX call_call_id_index ON call (call_id)"
-      ),
-      Statement(
-        name = "call_message_id_index",
-        sql = "CREATE INDEX call_message_id_index ON call (message_id)"
-      ),
-      Statement(
-        name = "message_ai",
-        sql = "CREATE TRIGGER message_ai AFTER INSERT ON message BEGIN\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
-      ),
-      Statement(
-        name = "message_ad",
-        sql = "CREATE TRIGGER message_ad AFTER DELETE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n        END"
-      ),
-      Statement(
-        name = "message_au",
-        sql = "CREATE TRIGGER message_au AFTER UPDATE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
-      ),
-      Statement(
-        name = "msl_message_delete",
-        sql = "CREATE TRIGGER msl_message_delete AFTER DELETE ON message \n        BEGIN \n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old._id);\n        END"
-      ),
-      Statement(
-        name = "msl_attachment_delete",
-        sql = "CREATE TRIGGER msl_attachment_delete AFTER DELETE ON part\n        BEGIN\n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old.mid);\n        END"
-      )
-    )
-  }
-}

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

@@ -14,6 +14,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.storageservice.storage.protos.groups.Member
 import org.signal.storageservice.storage.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -53,6 +54,8 @@ class NameCollisionTablesTest {
     setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
     setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
 
+    AppDependencies.recipientCache.clear()
+
     val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
     val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
 
@@ -80,6 +83,8 @@ class NameCollisionTablesTest {
     setProfileName(charlie, ProfileName.fromParts("Bob", "Android"))
     setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
 
+    AppDependencies.recipientCache.clear()
+
     val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
     val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
     val actualCharlie = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(charlie)
@@ -98,6 +103,8 @@ class NameCollisionTablesTest {
     setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
     setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
 
+    AppDependencies.recipientCache.clear()
+
     val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
 
     assertThat(actualAlice).hasSize(2)
@@ -136,6 +143,8 @@ class NameCollisionTablesTest {
     setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
     SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
 
+    AppDependencies.recipientCache.clear()
+
     val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
 
     assertThat(actualCollisions).hasSize(2)
@@ -153,6 +162,8 @@ class NameCollisionTablesTest {
     SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
     SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
 
+    AppDependencies.recipientCache.clear()
+
     val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
 
     assertThat(collisions).hasSize(2)

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

@@ -1190,16 +1190,16 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
 
     fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val recipient = Recipient.resolved(id)
+      val record = SignalDatabase.recipients.getRecord(id)
       val expected = RecipientTuple(
         e164 = e164,
         pni = pni,
         aci = aci
       )
       val actual = RecipientTuple(
-        e164 = recipient.e164.orElse(null),
-        pni = recipient.pni.orElse(null),
-        aci = recipient.aci.orElse(null)
+        e164 = record.e164,
+        pni = record.pni,
+        aci = record.aci
       )
 
       assertEquals("Recipient $id did not match expected result!", expected, actual)

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

@@ -313,7 +313,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
       timestamp = wallClock,
       groupId = groupId,
       update = updateDescription,
-      isGroupAdd = false,
+      isNotifiable = false,
       serverGuid = null
     )
   }

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

@@ -29,24 +29,39 @@ class ThreadTableTest_recents {
   }
 
   @Test
-  fun givenARecentRecipient_whenIBlockAndGetRecents_thenIDoNotExpectToSeeThatRecipient() {
-    // GIVEN
+  fun getRecentConversationList_excludes_blocked_recipients() {
+    createActiveThreadFor(recipient)
+
+    SignalDatabase.recipients.setBlocked(recipient.id, true)
+
+    assertFalse(recipient.id in getRecentConversationRecipients(limit = 10))
+  }
+
+  @Test
+  fun getRecentConversationList_excludes_hidden_recipients() {
+    createActiveThreadFor(recipient)
+
+    SignalDatabase.recipients.markHidden(recipient.id)
+
+    assertFalse(recipient.id in getRecentConversationRecipients(limit = 10))
+  }
+
+  private fun createActiveThreadFor(recipient: Recipient) {
     val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
     MmsHelper.insert(recipient = recipient, threadId = threadId)
     SignalDatabase.threads.update(threadId, true)
+  }
 
-    // WHEN
-    SignalDatabase.recipients.setBlocked(recipient.id, true)
-    val results: MutableList<RecipientId> = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor ->
-      val ids = mutableListOf<RecipientId>()
-      while (cursor.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID)))
+  @Suppress("SameParameterValue")
+  private fun getRecentConversationRecipients(limit: Int = 10): Set<RecipientId> {
+    return SignalDatabase.threads
+      .getRecentConversationList(limit = limit, includeInactiveGroups = false, individualsOnly = false, groupsOnly = false, hideV1Groups = false, hideSms = false, hideSelf = false)
+      .use { cursor ->
+        buildSet {
+          while (cursor.moveToNext()) {
+            add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID)))
+          }
+        }
       }
-
-      ids
-    }
-
-    // THEN
-    assertFalse(recipient.id in results)
   }
 }

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

@@ -316,7 +316,7 @@ class DataMessageProcessorTest_polls {
 
   private fun insertPoll(allowMultiple: Boolean = true): Long {
     val envelope = MessageContentFuzzer.envelope(100)
-    val pollMessage = IncomingMessage(type = MessageType.NORMAL, from = alice.id, sentTimeMillis = envelope.timestamp!!, serverTimeMillis = envelope.serverTimestamp!!, receivedTimeMillis = 0, groupId = groupId)
+    val pollMessage = IncomingMessage(type = MessageType.NORMAL, from = alice.id, sentTimeMillis = envelope.clientTimestamp!!, serverTimeMillis = envelope.serverTimestamp!!, receivedTimeMillis = 0, groupId = groupId)
     val messageId = SignalDatabase.messages.insertMessageInbox(pollMessage).get()
     SignalDatabase.polls.insertPoll("question?", allowMultiple, listOf("a", "b", "c"), alice.id.toLong(), messageId.messageId)
     return messageId.messageId

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

@@ -43,7 +43,7 @@ object MessageContentFuzzer {
    */
   fun envelope(timestamp: Long, serverGuid: UUID = UUID.randomUUID()): Envelope {
     return Envelope.Builder()
-      .timestamp(timestamp)
+      .clientTimestamp(timestamp)
       .serverTimestamp(timestamp + 5)
       .serverGuidBinary(serverGuid.toByteArray().toByteString())
       .build()
@@ -292,7 +292,7 @@ object MessageContentFuzzer {
             body = string()
             val quoted = quoteAble.random(random)
             quote = DataMessage.Quote.Builder().buildWith {
-              id = quoted.envelope.timestamp
+              id = quoted.envelope.clientTimestamp
               authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
               text = quoted.content.dataMessage?.body
               attachments(quoted.content.dataMessage?.attachments ?: emptyList())
@@ -304,7 +304,7 @@ object MessageContentFuzzer {
           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!!)
+              id = random.nextLong(quoted.envelope.clientTimestamp!! - 1000000, quoted.envelope.clientTimestamp!!)
               authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
               text = quoted.content.dataMessage?.body
             }
@@ -333,7 +333,7 @@ object MessageContentFuzzer {
               emoji = emojis.random(random)
               remove = false
               targetAuthorAciBinary = reactTo.metadata.sourceServiceId.toByteString()
-              targetSentTimestamp = reactTo.envelope.timestamp
+              targetSentTimestamp = reactTo.envelope.clientTimestamp
             }
           }
         }

app/src/benchmarkShared/java/org/signal/benchmark/BenchmarkCommandReceiver.kt

@@ -76,7 +76,7 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
 
     runBlocking {
       launch(Dispatchers.IO) {
-        Log.i(TAG, "Sending initial message form Bob to establish session.")
+        Log.i(TAG, "Sending initial message from Bob to establish session.")
         BenchmarkWebSocketConnection.addPendingMessages(listOf(encryptedEnvelope.toWebSocketPayload()))
         BenchmarkWebSocketConnection.releaseMessages()
 
@@ -85,6 +85,10 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
       }
     }
 
+    // Complete the session handshake so both sides have a proper double-ratchet session
+    Log.i(TAG, "Completing session handshake with reply.")
+    client.completeSession()
+
     // Have Bob generate N messages that will be received by Alice
     val messageCount = 500
     val envelopes = client.generateInboundEnvelopes(messageCount)
@@ -103,7 +107,7 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
 
     runBlocking {
       launch(Dispatchers.IO) {
-        Log.i(TAG, "Sending initial group messages from client to establish sessions.")
+        Log.i(TAG, "Sending initial group messages from clients to establish sessions.")
         BenchmarkWebSocketConnection.addPendingMessages(encryptedEnvelopes.map { it.toWebSocketPayload() })
         BenchmarkWebSocketConnection.releaseMessages()
 
@@ -112,6 +116,10 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
       }
     }
 
+    // Complete session handshakes so both sides have proper double-ratchet sessions
+    Log.i(TAG, "Completing session handshakes with Alice replies.")
+    clients.forEach { it.completeSession() }
+
     // Have clients generate N group messages that will be received by Alice
     val allClientMessages = clients.map { client ->
       val messageCount = 100
@@ -150,6 +158,9 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
         ThreadUtil.sleep(1000)
       }
     }
+
+    Log.i(TAG, "Completing session handshakes with Alice replies.")
+    clients.forEach { it.completeSession() }
   }
 
   private fun handleDeleteThread() {
@@ -201,7 +212,7 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
       verb = "PUT",
       path = "/api/v1/message",
       id = Random.nextLong(),
-      headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
+      headers = listOf("X-Signal-Timestamp: ${this.serverTimestamp}"),
       body = this.encodeByteString()
     )
   }

app/src/benchmarkShared/java/org/signal/benchmark/setup/Generator.kt

@@ -70,8 +70,8 @@ object Generator {
     val serverGuid = UUID.randomUUID()
     return Envelope.Builder()
       .type(Envelope.Type.fromValue(this.type))
-      .sourceDevice(1)
-      .timestamp(timestamp)
+      .sourceDeviceId(1)
+      .clientTimestamp(timestamp)
       .serverTimestamp(timestamp + 1)
       .destinationServiceId(destination.toString())
       .destinationServiceIdBinary(destination.toByteString())

app/src/benchmarkShared/java/org/signal/benchmark/setup/OtherClient.kt

@@ -24,8 +24,13 @@ import org.signal.libsignal.protocol.util.KeyHelper
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore
 import org.whispersystems.signalservice.api.SignalSessionLock
 import org.whispersystems.signalservice.api.crypto.EnvelopeContent
@@ -77,6 +82,35 @@ class OtherClient(val serviceId: ServiceId, val e164: String, val identityKeyPai
       .toEnvelope(timestamp, getAliceServiceId())
   }
 
+  fun decrypt(envelope: Envelope, serverDeliveredTimestamp: Long) {
+    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, SealedSenderAccessUtil.getCertificateValidator())
+    cipher.decrypt(envelope, serverDeliveredTimestamp)
+  }
+
+  /**
+   * Completes the Signal session handshake by having Alice (the app) encrypt a reply
+   * to this client, then decrypting it. This establishes a proper double-ratchet session
+   * on both sides.
+   *
+   * Must be called after this client's initial PreKeyMessage has been processed by Alice.
+   */
+  fun completeSession() {
+    val aliceAddress = SignalServiceAddress(Harness.SELF_ACI, Harness.SELF_E164)
+    val aliceCipher = SignalServiceCipher(aliceAddress, 1, AppDependencies.protocolStore.aci(), ReentrantSessionLock.INSTANCE, null)
+
+    val bobProtocolAddress = SignalProtocolAddress(serviceId.toString(), 1)
+    val now = System.currentTimeMillis()
+    val content = Generator.encryptedTextMessage(now)
+
+    val recipientId = RecipientId.from(SignalServiceAddress(serviceId, e164))
+    val sealedSenderAccess = SealedSenderAccessUtil.getSealedSenderAccessFor(Recipient.resolved(recipientId))
+
+    val outgoing = aliceCipher.encrypt(bobProtocolAddress, sealedSenderAccess, content)
+    val envelope = outgoing.toEnvelope(now, serviceId)
+
+    decrypt(envelope, now)
+  }
+
   fun generateInboundEnvelopes(count: Int): List<Envelope> {
     val envelopes = ArrayList<Envelope>(count)
     var now = System.currentTimeMillis()

app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt

@@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationM
 import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey
 import org.thoughtcrime.securesms.conversation.v2.data.IncomingTextOnly
 import org.thoughtcrime.securesms.conversation.v2.data.OutgoingTextOnly
+import org.thoughtcrime.securesms.database.CollapsedState
 import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryType
@@ -122,7 +123,10 @@ class ConversationElementGenerator {
       false,
       0,
       null,
-      null
+      CollapsedState.NONE,
+      0,
+      null,
+      false
     )
 
     val conversationMessage = ConversationMessageFactory.createWithUnresolvedData(

app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt

@@ -353,5 +353,13 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
     override fun onViewPinnedMessage(messageId: Long) {
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
+
+    override fun onExpandEvents(messageId: Long, itemView: View, collapsedSize: Int) {
+      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onCollapseEvents(messageId: Long, itemView: View, collapsedSize: Int) {
+      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
+    }
   }
 }

app/src/main/AndroidManifest.xml

@@ -458,6 +458,13 @@
             android:label="@string/AndroidManifest__select_contacts"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name=".search.SingleContactSelectionActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:exported="false"
+            android:label="@string/AndroidManifest__select_contacts"
+            android:windowSoftInputMode="stateHidden" />
+
         <activity
             android:name=".giph.ui.GiphyActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -668,6 +675,13 @@
             android:theme="@style/TextSecure.DarkNoActionBar"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name=".starred.StarredMessagesActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:exported="false"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateHidden" />
+
         <activity
             android:name=".mediaoverview.MediaOverviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -1282,16 +1296,6 @@
             android:enabled="true"
             android:exported="false" />
 
-        <service
-            android:name=".service.webrtc.AndroidCallConnectionService"
-            android:exported="true"
-            android:foregroundServiceType="phoneCall"
-            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-            tools:targetApi="28">
-            <intent-filter>
-                <action android:name="android.telecom.ConnectionService" />
-            </intent-filter>
-        </service>
 
         <service
             android:name=".components.voice.VoiceNotePlaybackService"
@@ -1401,7 +1405,7 @@
         <service
             android:name="org.thoughtcrime.securesms.service.webrtc.ActiveCallManager$ActiveCallForegroundService"
             android:exported="false"
-            android:foregroundServiceType="dataSync|microphone|camera" />
+            android:foregroundServiceType="dataSync|microphone|camera|phoneCall" />
 
         <service
             android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService"

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

@@ -224,7 +224,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
               .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), RemoteConfig.retryRespondMaxAge()))
               .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
               .addPostRender(RetrieveRemoteAnnouncementsJob::enqueue)
-              .addPostRender(() -> AndroidTelecomUtil.registerPhoneAccount())
+              .addPostRender(AndroidTelecomUtil::registerPhoneAccount)
               .addPostRender(() -> AppDependencies.getJobManager().add(new FontDownloaderJob()))
               .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
               .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)

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

@@ -148,5 +148,7 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onViewPollClicked(long messageId);
     void onToggleVote(@NonNull PollRecord poll, @NonNull PollOption pollOption, Boolean isChecked);
     void onViewPinnedMessage(long messageId);
+    void onExpandEvents(long messageId, @NonNull View itemView, int collapsedSize);
+    void onCollapseEvents(long messageId, @NonNull View itemView, int collapsedSize);
   }
 }

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

@@ -76,7 +76,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isMember(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
         builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
@@ -121,7 +121,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
+      if (SignalDatabase.groups().isMember(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
         builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));

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

@@ -365,9 +365,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
               @Override
               public void onDismissFindContactsBannerClicked() {
                 SignalStore.uiHints().markDismissedContactsPermissionBanner();
-                if (onRefreshListener != null) {
-                  onRefreshListener.onRefresh();
-                }
+                contactSearchMediator.refresh();
               }
 
               @Override

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

@@ -90,6 +90,7 @@ import org.signal.core.ui.isSplitPane
 import org.signal.core.ui.permissions.Permissions
 import org.signal.core.util.Util
 import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.getParcelableCompat
 import org.signal.core.util.getSerializableCompat
 import org.signal.core.util.logging.Log
 import org.signal.donations.StripeApi
@@ -142,6 +143,7 @@ import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
 import org.thoughtcrime.securesms.main.MainNavigationDetailLocationEffect
 import org.thoughtcrime.securesms.main.MainNavigationListLocation
 import org.thoughtcrime.securesms.main.MainNavigationRail
+import org.thoughtcrime.securesms.main.MainNavigationRouter
 import org.thoughtcrime.securesms.main.MainNavigationViewModel
 import org.thoughtcrime.securesms.main.MainSnackbar
 import org.thoughtcrime.securesms.main.MainSnackbarHostKey
@@ -157,7 +159,7 @@ import org.thoughtcrime.securesms.main.navigateToDetailLocation
 import org.thoughtcrime.securesms.main.rememberDetailNavHostController
 import org.thoughtcrime.securesms.main.rememberFocusRequester
 import org.thoughtcrime.securesms.main.storiesNavGraphBuilder
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.megaphone.Megaphone
 import org.thoughtcrime.securesms.megaphone.MegaphoneActionController
@@ -169,6 +171,7 @@ import org.thoughtcrime.securesms.notifications.profiles.NotificationProfiles
 import org.thoughtcrime.securesms.profiles.manage.UsernameEditFragment
 import org.thoughtcrime.securesms.service.BackupMediaRestoreService
 import org.thoughtcrime.securesms.service.KeyCachingService
+import org.thoughtcrime.securesms.starred.StarredMessagesActivity
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.stories.archive.StoryArchiveActivity
 import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment
@@ -192,12 +195,21 @@ import org.thoughtcrime.securesms.window.rememberThreePaneScaffoldNavigatorDeleg
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 import org.signal.core.ui.R as CoreUiR
 
-class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner, MainNavigator.NavigatorProvider, Material3OnScrollHelperBinder, ConversationListFragment.Callback, CallLogFragment.Callback, GooglePayComponent {
+class MainActivity :
+  PassphraseRequiredActivity(),
+  VoiceNoteMediaControllerOwner,
+  MainNavigator.NavigatorProvider,
+  Material3OnScrollHelperBinder,
+  ConversationListFragment.Callback,
+  MainNavigationRouter,
+  CallLogFragment.Callback,
+  GooglePayComponent {
 
   companion object {
     private val TAG = Log.tag(MainActivity::class)
 
     private const val KEY_STARTING_TAB = "STARTING_TAB"
+    private const val KEY_DETAIL_LOCATION = "DETAIL_LOCATION"
     const val RESULT_CONFIG_CHANGED = Activity.RESULT_FIRST_USER + 901
 
     @JvmStatic
@@ -210,6 +222,11 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
     fun clearTopAndOpenTab(context: Context, startingTab: MainNavigationListLocation): Intent {
       return clearTop(context).putExtra(KEY_STARTING_TAB, startingTab)
     }
+
+    @JvmStatic
+    fun clearTopAndOpenDetail(context: Context, location: MainNavigationDetailLocation): Intent {
+      return clearTop(context).putExtra(KEY_DETAIL_LOCATION, location)
+    }
   }
 
   private val dynamicTheme = DynamicNoActionBarTheme()
@@ -496,6 +513,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
               }
 
               is MainNavigationDetailLocation.Calls -> callsNavHostController.navigateToDetailLocation(location)
+
               is MainNavigationDetailLocation.Stories -> storiesNavHostController.navigateToDetailLocation(location)
             }
           }
@@ -811,6 +829,13 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
     handleDeepLinkIntent(intent)
 
     val extras = intent.extras ?: return
+
+    val detailLocation = extras.getParcelableCompat(KEY_DETAIL_LOCATION, MainNavigationDetailLocation::class.java)
+    if (detailLocation != null) {
+      mainNavigationViewModel.goTo(detailLocation)
+      return
+    }
+
     val startingTab = extras.getSerializableCompat(KEY_STARTING_TAB, MainNavigationListLocation::class.java)
 
     when (startingTab) {
@@ -1100,7 +1125,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
       }
     }
 
-    if (CameraXUtil.isSupported()) {
+    if (CameraXRemoteConfig.isSupported()) {
       onGranted()
     } else {
       Permissions.with(this@MainActivity)
@@ -1148,6 +1173,10 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
       toolbarViewModel.setChatFilter(ConversationFilter.OFF)
     }
 
+    override fun onStarredMessagesClick() {
+      startActivity(StarredMessagesActivity.createIntent(this@MainActivity))
+    }
+
     override fun onSettingsClick() {
       openSettings.launch(AppSettingsActivity.home(this@MainActivity))
     }
@@ -1205,6 +1234,14 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
       toolbarViewModel.setSearchQuery(query)
     }
 
+    override fun onSearchFilterClick() {
+      supportFragmentManager.fragments.forEach { fragment ->
+        if (fragment is ConversationListFragment) {
+          fragment.showSearchFilterBottomSheet()
+        }
+      }
+    }
+
     override fun onNotificationProfileTooltipDismissed() {
       SignalStore.notificationProfile.hasSeenTooltip = true
       toolbarViewModel.setShowNotificationProfilesTooltip(false)
@@ -1276,4 +1313,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
       }
     }
   }
+
+  override fun goTo(location: MainNavigationListLocation) = mainNavigationViewModel.goTo(location)
+  override fun goTo(location: MainNavigationDetailLocation) = mainNavigationViewModel.goTo(location)
 }

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

@@ -41,9 +41,14 @@ public class MainNavigator {
   }
 
   public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition) {
+    goToConversation(recipientId, threadId, distributionType, startingPosition, false);
+  }
+
+  public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition, boolean incognito) {
     Disposable disposable = ConversationIntents.createBuilder(activity, recipientId, threadId)
                                                .map(builder -> builder.withDistributionType(distributionType)
                                                                       .withStartingPosition(startingPosition)
+                                                                      .asIncognito(incognito)
                                                                       .toConversationArgs())
                                                .subscribe(args -> viewModel.goTo(new MainNavigationDetailLocation.Chats.Conversation(args)));
 

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

@@ -8,16 +8,19 @@ package org.thoughtcrime.securesms.attachments
 import android.content.Context
 import android.graphics.Bitmap
 import org.signal.blurhash.BlurHashEncoder
+import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
 import org.signal.core.util.mebiBytes
-import org.signal.protos.resumableuploads.ResumableUpload
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream
-import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec
+import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
 import java.io.IOException
+import java.io.InputStream
+import java.security.MessageDigest
 import java.util.Objects
 
 /**
@@ -32,6 +35,29 @@ object AttachmentUploadUtil {
    */
   val FOREGROUND_LIMIT_BYTES: Long = 10.mebiBytes.inWholeBytes
 
+  /**
+   * Computes the base64-encoded SHA-256 checksum of the ciphertext that would result from encrypting [plaintextStream]
+   * with the given [key] and [iv], including padding, IV prefix, and HMAC suffix.
+   */
+  fun computeCiphertextChecksum(key: ByteArray, iv: ByteArray, plaintextStream: InputStream, plaintextSize: Long): String {
+    val paddedStream = PaddingInputStream(plaintextStream, plaintextSize)
+    return Base64.encodeWithPadding(AttachmentCipherStreamUtil.computeCiphertextSha256(key, iv, paddedStream))
+  }
+
+  /**
+   * Computes the base64-encoded SHA-256 checksum of the raw bytes in [inputStream].
+   * Used for pre-encrypted uploads where the data is already in its final form.
+   */
+  fun computeRawChecksum(inputStream: InputStream): String {
+    val digest = MessageDigest.getInstance("SHA-256")
+    val buffer = ByteArray(16 * 1024)
+    var read: Int
+    while (inputStream.read(buffer).also { read = it } != -1) {
+      digest.update(buffer, 0, read)
+    }
+    return Base64.encodeWithPadding(digest.digest())
+  }
+
   /**
    * Builds a [SignalServiceAttachmentStream] from the provided data, which can then be provided to various upload methods.
    */
@@ -39,7 +65,6 @@ object AttachmentUploadUtil {
   fun buildSignalServiceAttachmentStream(
     context: Context,
     attachment: Attachment,
-    uploadSpec: ResumableUpload,
     cancellationSignal: (() -> Boolean)? = null,
     progressListener: ProgressListener? = null
   ): SignalServiceAttachmentStream {
@@ -57,7 +82,6 @@ object AttachmentUploadUtil {
       .withHeight(attachment.height)
       .withUploadTimestamp(System.currentTimeMillis())
       .withCaption(attachment.caption)
-      .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
       .withCancelationSignal(cancellationSignal)
       .withListener(progressListener)
       .withUuid(attachment.uuid)

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

@@ -22,8 +22,7 @@ public final class AudioWaveFormGenerator {
 
   private static final String TAG = Log.tag(AudioWaveFormGenerator.class);
 
-  public static final  int BAR_COUNT       = 46;
-  private static final int SAMPLES_PER_BAR = 4;
+  public static final int BAR_COUNT = 46;
 
   private AudioWaveFormGenerator() {}
 
@@ -68,44 +67,37 @@ public final class AudioWaveFormGenerator {
 
       extractor.selectTrack(0);
 
-      long                  kTimeOutUs      = 5000;
-      MediaCodec.BufferInfo info            = new MediaCodec.BufferInfo();
-      boolean               sawInputEOS     = false;
-      boolean               sawOutputEOS    = false;
-      int                   noOutputCounter = 0;
+      long                  kTimeOutUs              = 5000;
+      MediaCodec.BufferInfo info                    = new MediaCodec.BufferInfo();
+      boolean               extractorDone           = false;
+      boolean               inputEOSQueued          = false;
+      boolean               sawOutputEOS            = false;
+      int                   noOutputCounter         = 0;
+      int                   maxSamplesPerBar        = Math.max(1, (int) (totalDurationUs / BAR_COUNT / 10_000));
+      boolean[]             barSufficientlySampled  = new boolean[BAR_COUNT];
 
       while (!sawOutputEOS && noOutputCounter < 50) {
         noOutputCounter++;
-        if (!sawInputEOS) {
+        if (!inputEOSQueued) {
           int inputBufIndex = codec.dequeueInputBuffer(kTimeOutUs);
           if (inputBufIndex >= 0) {
-            ByteBuffer dstBuf             = codec.getInputBuffer(inputBufIndex);
-            int        sampleSize         = extractor.readSampleData(dstBuf, 0);
-            long       presentationTimeUs = 0;
-
-            if (sampleSize < 0) {
-              sawInputEOS = true;
-              sampleSize  = 0;
+            if (extractorDone) {
+              codec.queueInputBuffer(inputBufIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+              inputEOSQueued = true;
             } else {
-              presentationTimeUs = extractor.getSampleTime();
-            }
+              ByteBuffer dstBuf             = codec.getInputBuffer(inputBufIndex);
+              int        sampleSize         = extractor.readSampleData(dstBuf, 0);
+              long       presentationTimeUs = 0;
 
-            codec.queueInputBuffer(
-              inputBufIndex,
-              0,
-              sampleSize,
-              presentationTimeUs,
-              sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+              if (sampleSize < 0) {
+                codec.queueInputBuffer(inputBufIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+                inputEOSQueued = true;
+              } else {
+                presentationTimeUs = extractor.getSampleTime();
 
-            if (!sawInputEOS) {
-              int barSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-              sawInputEOS = !extractor.advance();
-              int nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-              while (!sawInputEOS && nextBarSampleIndex == barSampleIndex) {
-                sawInputEOS = !extractor.advance();
-                if (!sawInputEOS) {
-                  nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-                }
+                codec.queueInputBuffer(inputBufIndex, 0, sampleSize, presentationTimeUs, 0);
+
+                extractorDone = !extractor.advance();
               }
             }
           }
@@ -119,16 +111,19 @@ public final class AudioWaveFormGenerator {
               noOutputCounter = 0;
             }
 
-            ByteBuffer buf = codec.getOutputBuffer(outputBufferIndex);
             int barIndex = (int) ((wave.length * info.presentationTimeUs) / totalDurationUs);
-            long total = 0;
-            for (int i = 0; i < info.size; i += 2 * 4) {
-              short aShort = buf.getShort(i);
-              total += Math.abs(aShort);
-            }
-            if (barIndex >= 0 && barIndex < wave.length) {
+            if (barIndex >= 0 && barIndex < wave.length && !barSufficientlySampled[barIndex]) {
+              ByteBuffer buf = codec.getOutputBuffer(outputBufferIndex);
+              long total = 0;
+              for (int i = 0; i < info.size; i += 2 * 4) {
+                short aShort = buf.getShort(i);
+                total += Math.abs(aShort);
+              }
               wave[barIndex] += total;
               waveSamples[barIndex] += info.size / 2;
+              if (waveSamples[barIndex] >= maxSamplesPerBar) {
+                barSufficientlySampled[barIndex] = true;
+              }
             }
             codec.releaseOutputBuffer(outputBufferIndex, false);
             if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {

app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatar.kt

@@ -46,9 +46,9 @@ sealed interface FallbackAvatar {
     fun getIconBySize(size: Size): Int
 
     /**
-     * Local user
+     * Note to Self / local user
      */
-    data class Local(override val color: AvatarColor) : Resource {
+    data class NoteToSelf(override val color: AvatarColor) : Resource {
       override fun getIconBySize(size: Size): Int {
         return when (size) {
           Size.SMALL -> R.drawable.symbol_note_compact_16

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

@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.avatar.vector.VectorAvatarCreationFragment
 import org.thoughtcrime.securesms.components.ButtonStripItemView
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -223,7 +223,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
 
   @Suppress("DEPRECATION")
   private fun openCameraCapture() {
-    if (CameraXUtil.isSupported()) {
+    if (CameraXRemoteConfig.isSupported()) {
       val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
       startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
     } else {