Bump version to 6.30.4

This reverts commit 8b2a535f19.

.editorconfig

@@ -5,4 +5,5 @@ indent_size = 2
 ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_allow_trailing_comma = false
 ktlint_code_style = intellij_idea
-twitter_compose_allowed_composition_locals=LocalExtendedColors
+twitter_compose_allowed_composition_locals=LocalExtendedColors
+ktlint_standard_class-naming = disabled

app/build.gradle

@@ -10,7 +10,6 @@ plugins {
     id 'app.cash.exhaustive'
     id 'kotlin-parcelize'
     id 'com.squareup.wire'
-    id 'android-constants'
     id 'translations'
 }
 
@@ -45,8 +44,8 @@ ktlint {
     version = "0.49.1"
 }
 
-def canonicalVersionCode = 1285
-def canonicalVersionName = "6.25.1"
+def canonicalVersionCode = 1319
+def canonicalVersionName = "6.30.4"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -94,7 +93,7 @@ android {
     testBuildType 'instrumentation'
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = signalKotlinJvmTarget
         freeCompilerArgs = ["-Xallow-result-return-type"]
     }
 
@@ -229,8 +228,8 @@ android {
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
+        resourceConfigurations += []
 
-        resConfigs autoResConfig()
 
         splits {
             abi {
@@ -382,7 +381,7 @@ android {
             buildConfigField "String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\""
             buildConfigField "String", "SVR2_MRENCLAVE", "\"a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95\""
             buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b\", " +
-                                                                                                                               "\"9dbc6855c198e04f21b5cc35df839fdcd51b53658454dfa3f817afefaffc95ef\", " +
+                                                                                                                               "\"ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa\", " +
                                                                                                                                "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
             buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
                                                                                                                                                                                  "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
@@ -511,7 +510,7 @@ dependencies {
     implementation libs.google.play.services.maps
     implementation libs.google.play.services.auth
 
-    implementation libs.bundles.exoplayer
+    implementation libs.bundles.media3
 
     implementation libs.conscrypt.android
     implementation libs.signal.aesgcmprovider

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt

@@ -10,13 +10,11 @@ import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.kotlin.mock
 import org.signal.core.util.ThreadUtil
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
 import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
@@ -37,6 +35,7 @@ import org.thoughtcrime.securesms.testing.success
 import org.thoughtcrime.securesms.testing.timeout
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
 import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.internal.push.MismatchedDevices
 import org.whispersystems.signalservice.internal.push.PreKeyState
 import java.util.UUID
@@ -48,20 +47,17 @@ class ChangeNumberViewModelTest {
   val harness = SignalActivityRule()
 
   private lateinit var viewModel: ChangeNumberViewModel
-  private lateinit var kbsRepository: KbsRepository
 
   @Before
   fun setUp() {
     ApplicationDependencies.getSignalServiceAccountManager().setSoTimeoutMillis(1000)
-    kbsRepository = mock()
     ThreadUtil.runOnMainSync {
       viewModel = ChangeNumberViewModel(
         localNumber = harness.self.requireE164(),
         changeNumberRepository = ChangeNumberRepository(),
         savedState = SavedStateHandle(),
         password = SignalStore.account().servicePassword!!,
-        verifyAccountRepository = VerifyAccountRepository(harness.application),
-        kbsRepository = kbsRepository
+        verifyAccountRepository = VerifyAccountRepository(harness.application)
       )
 
       viewModel.setNewCountry(1)
@@ -78,7 +74,7 @@ class ChangeNumberViewModelTest {
   fun testChangeNumber_givenOnlyPrimaryAndNoRegLock() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
@@ -185,7 +181,7 @@ class ChangeNumberViewModelTest {
     val aci = Recipient.self().requireServiceId()
     val oldPni = Recipient.self().requirePni()
     val oldE164 = Recipient.self().requireE164()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
 
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
@@ -230,12 +226,12 @@ class ChangeNumberViewModelTest {
   fun testChangeNumber_givenOnlyPrimaryAndRegistrationLock() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
 
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
-    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
+    MockProvider.mockGetRegistrationLockStringFlow()
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
@@ -274,7 +270,7 @@ class ChangeNumberViewModelTest {
   fun testChangeNumber_givenMismatchedDevicesOnFirstCall() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
@@ -318,12 +314,12 @@ class ChangeNumberViewModelTest {
   fun testChangeNumber_givenRegLockAndMismatchedDevicesOnFirstTwoCalls() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
 
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
-    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
+    MockProvider.mockGetRegistrationLockStringFlow()
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },

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

@@ -8,6 +8,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
 import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage

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

@@ -7,6 +7,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId

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

@@ -0,0 +1,328 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.conversation.v2.items
+
+import android.net.Uri
+import android.view.View
+import androidx.lifecycle.Observer
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.signal.ringrtc.CallLinkRootKey
+import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState
+import org.thoughtcrime.securesms.contactshare.Contact
+import org.thoughtcrime.securesms.conversation.ConversationAdapter
+import org.thoughtcrime.securesms.conversation.ConversationItem
+import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode
+import org.thoughtcrime.securesms.conversation.ConversationMessage
+import org.thoughtcrime.securesms.conversation.colors.Colorizer
+import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
+import org.thoughtcrime.securesms.database.FakeMessageRecords
+import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
+import org.thoughtcrime.securesms.linkpreview.LinkPreview
+import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.stickers.StickerLocator
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import kotlin.time.Duration.Companion.minutes
+
+class V2ConversationItemShapeTest {
+
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 10)
+
+  @Test
+  fun givenNextAndPreviousMessageDoNotExist_whenISetMessageShape_thenIExpectSingle() {
+    val testSubject = V2ConversationItemShape(FakeConversationContext())
+
+    val expected = V2ConversationItemShape.MessageShape.SINGLE
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenPreviousWithinTimeoutAndNoNext_whenISetMessageShape_thenIExpectEnd() {
+    val now = System.currentTimeMillis()
+    val prev = now - 2.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        previousMessage = getMessageRecord(prev)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.END
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(now),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenNextWithinTimeoutAndNoPrevious_whenISetMessageShape_thenIExpectStart() {
+    val now = System.currentTimeMillis()
+    val prev = now - 2.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        nextMessage = getMessageRecord(now)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.START
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(prev),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenPreviousAndNextWithinTimeout_whenISetMessageShape_thenIExpectMiddle() {
+    val now = System.currentTimeMillis()
+    val prev = now - 2.minutes.inWholeMilliseconds
+    val next = now + 2.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        previousMessage = getMessageRecord(prev),
+        nextMessage = getMessageRecord(next)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.MIDDLE
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(now),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenPreviousOutsideTimeoutAndNoNext_whenISetMessageShape_thenIExpectSingle() {
+    val now = System.currentTimeMillis()
+    val prev = now - 4.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        previousMessage = getMessageRecord(prev)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.SINGLE
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(now),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenNextOutsideTimeoutAndNoPrevious_whenISetMessageShape_thenIExpectSingle() {
+    val now = System.currentTimeMillis()
+    val prev = now - 4.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        nextMessage = getMessageRecord(now)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.SINGLE
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(prev),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  fun givenPreviousAndNextOutsideTimeout_whenISetMessageShape_thenIExpectSingle() {
+    val now = System.currentTimeMillis()
+    val prev = now - 4.minutes.inWholeMilliseconds
+    val next = now + 4.minutes.inWholeMilliseconds
+
+    val testSubject = V2ConversationItemShape(
+      FakeConversationContext(
+        previousMessage = getMessageRecord(prev),
+        nextMessage = getMessageRecord(next)
+      )
+    )
+
+    val expected = V2ConversationItemShape.MessageShape.SINGLE
+    val actual = testSubject.setMessageShape(
+      isLtr = true,
+      currentMessage = getMessageRecord(now),
+      isGroupThread = false,
+      adapterPosition = 5
+    )
+
+    assertEquals(expected, actual)
+  }
+
+  private fun getMessageRecord(
+    timestamp: Long = System.currentTimeMillis()
+  ): MessageRecord {
+    return FakeMessageRecords.buildMediaMmsMessageRecord(
+      dateReceived = timestamp,
+      dateSent = timestamp,
+      dateServer = timestamp
+    )
+  }
+
+  private class FakeConversationContext(
+    private val hasWallpaper: Boolean = false,
+    private val previousMessage: MessageRecord? = null,
+    private val nextMessage: MessageRecord? = null
+  ) : V2ConversationContext {
+
+    private val colorizer = Colorizer()
+
+    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.STANDARD
+
+    override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
+    override val selectedItems: Set<MultiselectPart> = emptySet()
+    override val isMessageRequestAccepted: Boolean = true
+    override val searchQuery: String? = null
+
+    override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit
+
+    override fun hasWallpaper(): Boolean = hasWallpaper
+
+    override fun getColorizer(): Colorizer = colorizer
+
+    override fun getNextMessage(adapterPosition: Int): MessageRecord? = nextMessage
+
+    override fun getPreviousMessage(adapterPosition: Int): MessageRecord? = previousMessage
+  }
+
+  private object FakeConversationItemClickListener : ConversationAdapter.ItemClickListener {
+    override fun onQuoteClicked(messageRecord: MmsMessageRecord?) = Unit
+
+    override fun onLinkPreviewClicked(linkPreview: LinkPreview) = Unit
+
+    override fun onQuotedIndicatorClicked(messageRecord: MessageRecord) = Unit
+
+    override fun onMoreTextClicked(conversationRecipientId: RecipientId, messageId: Long, isMms: Boolean) = Unit
+
+    override fun onStickerClicked(stickerLocator: StickerLocator) = Unit
+
+    override fun onViewOnceMessageClicked(messageRecord: MmsMessageRecord) = Unit
+
+    override fun onSharedContactDetailsClicked(contact: Contact, avatarTransitionView: View) = Unit
+
+    override fun onAddToContactsClicked(contact: Contact) = Unit
+
+    override fun onMessageSharedContactClicked(choices: MutableList<Recipient>) = Unit
+
+    override fun onInviteSharedContactClicked(choices: MutableList<Recipient>) = Unit
+
+    override fun onReactionClicked(multiselectPart: MultiselectPart, messageId: Long, isMms: Boolean) = Unit
+
+    override fun onGroupMemberClicked(recipientId: RecipientId, groupId: GroupId) = Unit
+
+    override fun onMessageWithErrorClicked(messageRecord: MessageRecord) = Unit
+
+    override fun onMessageWithRecaptchaNeededClicked(messageRecord: MessageRecord) = Unit
+
+    override fun onIncomingIdentityMismatchClicked(recipientId: RecipientId) = Unit
+
+    override fun onRegisterVoiceNoteCallbacks(onPlaybackStartObserver: Observer<VoiceNotePlaybackState>) = Unit
+
+    override fun onUnregisterVoiceNoteCallbacks(onPlaybackStartObserver: Observer<VoiceNotePlaybackState>) = Unit
+
+    override fun onVoiceNotePause(uri: Uri) = Unit
+
+    override fun onVoiceNotePlay(uri: Uri, messageId: Long, position: Double) = Unit
+
+    override fun onVoiceNoteSeekTo(uri: Uri, position: Double) = Unit
+
+    override fun onVoiceNotePlaybackSpeedChanged(uri: Uri, speed: Float) = Unit
+
+    override fun onGroupMigrationLearnMoreClicked(membershipChange: GroupMigrationMembershipChange) = Unit
+
+    override fun onChatSessionRefreshLearnMoreClicked() = Unit
+
+    override fun onBadDecryptLearnMoreClicked(author: RecipientId) = Unit
+
+    override fun onSafetyNumberLearnMoreClicked(recipient: Recipient) = Unit
+
+    override fun onJoinGroupCallClicked() = Unit
+
+    override fun onInviteFriendsToGroupClicked(groupId: GroupId.V2) = Unit
+
+    override fun onEnableCallNotificationsClicked() = Unit
+
+    override fun onPlayInlineContent(conversationMessage: ConversationMessage?) = Unit
+
+    override fun onInMemoryMessageClicked(messageRecord: InMemoryMessageRecord) = Unit
+
+    override fun onViewGroupDescriptionChange(groupId: GroupId?, description: String, isMessageRequestAccepted: Boolean) = Unit
+
+    override fun onChangeNumberUpdateContact(recipient: Recipient) = Unit
+
+    override fun onCallToAction(action: String) = Unit
+
+    override fun onDonateClicked() = Unit
+
+    override fun onBlockJoinRequest(recipient: Recipient) = Unit
+
+    override fun onRecipientNameClicked(target: RecipientId) = Unit
+
+    override fun onInviteToSignalClicked() = Unit
+
+    override fun onActivatePaymentsClicked() = Unit
+
+    override fun onSendPaymentClicked(recipientId: RecipientId) = Unit
+
+    override fun onScheduledIndicatorClicked(view: View, conversationMessage: ConversationMessage) = Unit
+
+    override fun onUrlClicked(url: String): Boolean = false
+
+    override fun onViewGiftBadgeClicked(messageRecord: MessageRecord) = Unit
+
+    override fun onGiftBadgeRevealed(messageRecord: MessageRecord) = Unit
+
+    override fun goToMediaPreview(parent: ConversationItem?, sharedElement: View?, args: MediaIntentFactory.MediaPreviewArgs?) = Unit
+
+    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) = Unit
+
+    override fun onShowGroupDescriptionClicked(groupName: String, description: String, shouldLinkifyWebLinks: Boolean) = Unit
+
+    override fun onJoinCallLink(callLinkRootKey: CallLinkRootKey) = Unit
+
+    override fun onItemClick(item: MultiselectPart?) = Unit
+
+    override fun onItemLongClick(itemView: View?, item: MultiselectPart?) = Unit
+  }
+}

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

@@ -6,12 +6,16 @@ import androidx.test.filters.FlakyTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.mms.MediaStream
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.testing.assertIsNot
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
 
@@ -64,6 +68,7 @@ class AttachmentTableTest {
   }
 
   @FlakyTest
+  @Ignore("test is flaky")
   @Test
   fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
@@ -90,6 +95,45 @@ class AttachmentTableTest {
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
+  /**
+   * Given: A previous attachment and two pre-upload attachments with the same data but different transform properties (standard and high).
+   *
+   * When changing content of standard pre-upload attachment to match pre-existing attachment
+   *
+   * Then update standard pre-upload attachment to match previous attachment, do not update high pre-upload attachment, and do
+   * not delete shared pre-upload uri from disk as it is still being used by the high pre-upload attachment.
+   */
+  @Test
+  fun doNotDeleteDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
+    // GIVEN
+    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
+    val compressedData = byteArrayOf(1, 2, 3)
+
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+
+    val previousAttachment = createAttachment(1, BlobProvider.getInstance().forData(compressedData).createForSingleSessionInMemory(), AttachmentTable.TransformProperties.empty())
+    val previousDatabaseAttachmentId: AttachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(1, listOf(previousAttachment), emptyList()).values.first()
+
+    val standardQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.empty())
+    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
+
+    val highQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
+    val highDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityPreUpload)
+
+    // WHEN
+    SignalDatabase.attachments.updateAttachmentData(standardDatabaseAttachment, createMediaStream(compressedData), false)
+
+    // THEN
+    val previousInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(previousDatabaseAttachmentId, AttachmentTable.DATA)!!
+    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+
+    assertNotEquals(standardInfo, highInfo)
+    standardInfo.file assertIs previousInfo.file
+    highInfo.file assertIsNot standardInfo.file
+    highInfo.file.exists() assertIs true
+  }
+
   private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
     return UriAttachmentBuilder.build(
       id,

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import junit.framework.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.calls.log.CallLogFilter
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
+import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+@RunWith(AndroidJUnit4::class)
+class CallLinkTableTest {
+
+  companion object {
+    private val ROOM_ID_A = byteArrayOf(1, 2, 3, 4)
+    private val ROOM_ID_B = byteArrayOf(2, 2, 3, 4)
+    private const val TIMESTAMP_A = 1000L
+    private const val TIMESTAMP_B = 2000L
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule(createGroup = true)
+
+  @Test
+  fun givenTwoNonAdminCallLinks_whenIDeleteBeforeFirst_thenIExpectNeitherDeleted() {
+    insertTwoNonAdminCallLinksWithEvents()
+    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_A - 500)
+    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
+    assertEquals(2, callEvents.size)
+  }
+
+  @Test
+  fun givenTwoNonAdminCallLinks_whenIDeleteOnFirst_thenIExpectFirstDeleted() {
+    insertTwoNonAdminCallLinksWithEvents()
+    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_A)
+    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
+    assertEquals(1, callEvents.size)
+    assertEquals(TIMESTAMP_B, callEvents.first().record.timestamp)
+  }
+
+  @Test
+  fun givenTwoNonAdminCallLinks_whenIDeleteAfterFirstAndBeforeSecond_thenIExpectFirstDeleted() {
+    insertTwoNonAdminCallLinksWithEvents()
+    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B - 500)
+    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
+    assertEquals(1, callEvents.size)
+    assertEquals(TIMESTAMP_B, callEvents.first().record.timestamp)
+  }
+
+  @Test
+  fun givenTwoNonAdminCallLinks_whenIDeleteOnSecond_thenIExpectBothDeleted() {
+    insertTwoNonAdminCallLinksWithEvents()
+    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B)
+    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
+    assertEquals(0, callEvents.size)
+  }
+
+  @Test
+  fun givenTwoNonAdminCallLinks_whenIDeleteAfterSecond_thenIExpectBothDeleted() {
+    insertTwoNonAdminCallLinksWithEvents()
+    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B + 500)
+    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
+    assertEquals(0, callEvents.size)
+  }
+
+  private fun insertTwoNonAdminCallLinksWithEvents() {
+    insertCallLinkWithEvent(ROOM_ID_A, 1000)
+    insertCallLinkWithEvent(ROOM_ID_B, 2000)
+  }
+
+  private fun insertCallLinkWithEvent(roomId: ByteArray, timestamp: Long) {
+    SignalDatabase.callLinks.insertCallLink(
+      CallLinkTable.CallLink(
+        recipientId = RecipientId.UNKNOWN,
+        roomId = CallLinkRoomId.fromBytes(roomId),
+        credentials = CallLinkCredentials(
+          linkKeyBytes = roomId,
+          adminPassBytes = null
+        ),
+        state = SignalCallLinkState()
+      )
+    )
+
+    val callLinkRecipient = SignalDatabase.recipients.getByCallLinkRoomId(CallLinkRoomId.fromBytes(roomId)).get()
+
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      1,
+      callLinkRecipient,
+      CallTable.Direction.INCOMING,
+      timestamp
+    )
+  }
+}

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

@@ -10,13 +10,18 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.ringrtc.CallId
 import org.signal.ringrtc.CallManager
+import org.thoughtcrime.securesms.calls.log.CallLogFilter
+import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 
 @RunWith(AndroidJUnit4::class)
 class CallTableTest {
 
   @get:Rule
-  val harness = SignalActivityRule()
+  val harness = SignalActivityRule(createGroup = true)
+
+  private val groupRecipientId: RecipientId
+    get() = harness.group!!.recipientId
 
   @Test
   fun givenACall_whenISetTimestamp_thenIExpectUpdatedTimestamp() {
@@ -24,13 +29,13 @@ class CallTableTest {
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       now
     )
 
-    SignalDatabase.calls.setTimestamp(callId, harness.others[0], -1L)
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    SignalDatabase.calls.setTimestamp(callId, groupRecipientId, -1L)
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(-1L, call?.timestamp)
 
@@ -45,15 +50,15 @@ class CallTableTest {
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       now
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     SignalDatabase.calls.deleteGroupCall(call!!)
 
-    val deletedCall = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val deletedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
 
     assertEquals(CallTable.Event.DELETE, deletedCall?.event)
@@ -66,12 +71,12 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.OUTGOING,
       System.currentTimeMillis()
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
 
     val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
@@ -86,12 +91,12 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.OUTGOING,
       System.currentTimeMillis()
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
     assertEquals(harness.self.id, call?.ringerRecipient)
@@ -103,12 +108,12 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       System.currentTimeMillis()
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.JOINED, call?.event)
     assertNull(call?.ringerRecipient)
@@ -120,13 +125,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       ringId = callId,
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       ringerRecipient = harness.others[1],
       dateReceived = System.currentTimeMillis(),
       ringState = CallManager.RingUpdate.REQUESTED
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.RINGING, call?.event)
 
@@ -134,7 +139,7 @@ class CallTableTest {
       call!!
     )
 
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
   }
 
@@ -143,13 +148,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       ringId = callId,
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       ringerRecipient = harness.others[1],
       dateReceived = System.currentTimeMillis(),
       ringState = CallManager.RingUpdate.EXPIRED_REQUEST
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
 
@@ -157,7 +162,7 @@ class CallTableTest {
       call!!
     )
 
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
   }
 
@@ -166,13 +171,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       ringId = callId,
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       ringerRecipient = harness.others[1],
       dateReceived = System.currentTimeMillis(),
       ringState = CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.DECLINED, call?.event)
 
@@ -180,7 +185,7 @@ class CallTableTest {
       call!!
     )
 
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
   }
 
@@ -189,7 +194,7 @@ class CallTableTest {
     val era = "aaa"
     val callId = CallId.fromEra(era).longValue()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = System.currentTimeMillis(),
       peekGroupCallEraId = "aaa",
@@ -197,7 +202,7 @@ class CallTableTest {
       isCallFull = false
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
 
@@ -205,7 +210,7 @@ class CallTableTest {
       call!!
     )
 
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertEquals(CallTable.Event.JOINED, acceptedCall?.event)
   }
 
@@ -214,7 +219,7 @@ class CallTableTest {
     val era = "aaa"
     val callId = CallId.fromEra(era).longValue()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = System.currentTimeMillis(),
       peekGroupCallEraId = "aaa",
@@ -222,7 +227,7 @@ class CallTableTest {
       isCallFull = false
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
   }
@@ -233,7 +238,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -241,13 +246,13 @@ class CallTableTest {
       isCallFull = false
     )
 
-    SignalDatabase.calls.getCallById(callId, harness.others[0]).let {
+    SignalDatabase.calls.getCallById(callId, groupRecipientId).let {
       assertNotNull(it)
       assertEquals(now, it?.timestamp)
     }
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = 1L,
       peekGroupCallEraId = "aaa",
@@ -255,7 +260,7 @@ class CallTableTest {
       isCallFull = false
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
     assertEquals(1L, call?.timestamp)
@@ -266,20 +271,20 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
       callId = callId,
-      recipientId = harness.others[0],
+      recipientId = groupRecipientId,
       direction = CallTable.Direction.INCOMING,
       timestamp = System.currentTimeMillis()
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       ringId = callId,
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       ringerRecipient = harness.others[1],
       dateReceived = System.currentTimeMillis(),
       ringState = CallManager.RingUpdate.REQUESTED
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.DELETE, call?.event)
   }
@@ -290,7 +295,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -300,13 +305,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.RINGING, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -319,20 +324,20 @@ class CallTableTest {
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       now
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.ACCEPTED, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -344,7 +349,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -354,13 +359,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.EXPIRED_REQUEST
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -372,7 +377,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -382,7 +387,7 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
@@ -390,13 +395,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.EXPIRED_REQUEST
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -409,20 +414,20 @@ class CallTableTest {
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       now
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_LOCALLY
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.ACCEPTED, call?.event)
   }
@@ -434,20 +439,20 @@ class CallTableTest {
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.INCOMING,
       now
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.ACCEPTED, call?.event)
   }
@@ -458,7 +463,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -468,7 +473,7 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
@@ -476,13 +481,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_LOCALLY
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
   }
@@ -493,7 +498,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -503,7 +508,7 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
@@ -511,13 +516,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
   }
@@ -528,7 +533,7 @@ class CallTableTest {
     val callId = CallId.fromEra(era).longValue()
     val now = System.currentTimeMillis()
     SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = harness.others[0],
+      groupRecipientId = groupRecipientId,
       sender = harness.others[1],
       timestamp = now,
       peekGroupCallEraId = "aaa",
@@ -538,13 +543,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.ACCEPTED, call?.event)
   }
@@ -556,7 +561,7 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
@@ -564,13 +569,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.DECLINED, call?.event)
   }
@@ -582,7 +587,7 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.EXPIRED_REQUEST
@@ -590,13 +595,13 @@ class CallTableTest {
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.DECLINED, call?.event)
   }
@@ -608,20 +613,20 @@ class CallTableTest {
 
     SignalDatabase.calls.insertAcceptedGroupCall(
       callId,
-      harness.others[0],
+      groupRecipientId,
       CallTable.Direction.OUTGOING,
       System.currentTimeMillis()
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
   }
@@ -631,13 +636,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.REQUESTED
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.RINGING, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -649,13 +654,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.EXPIRED_REQUEST
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -667,13 +672,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.CANCELLED_BY_RINGER
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertEquals(harness.others[1], call?.ringerRecipient)
@@ -685,13 +690,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_LOCALLY
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertNotNull(call?.messageId)
@@ -702,13 +707,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.MISSED, call?.event)
     assertNotNull(call?.messageId)
@@ -719,13 +724,13 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.ACCEPTED, call?.event)
     assertNotNull(call?.messageId)
@@ -736,15 +741,85 @@ class CallTableTest {
     val callId = 1L
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
       callId,
-      harness.others[0],
+      groupRecipientId,
       harness.others[1],
       System.currentTimeMillis(),
       CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
     )
 
-    val call = SignalDatabase.calls.getCallById(callId, harness.others[0])
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     assertNotNull(call)
     assertEquals(CallTable.Event.DECLINED, call?.event)
     assertNotNull(call?.messageId)
   }
+
+  @Test
+  fun givenTwoCalls_whenIDeleteBeforeCallB_thenOnlyDeleteCallA() {
+    insertTwoCallEvents()
+
+    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(1500)
+
+    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
+    assertEquals(1, allCallEvents.size)
+    assertEquals(2, allCallEvents.first().record.callId)
+  }
+
+  @Test
+  fun givenTwoCalls_whenIDeleteBeforeCallA_thenIDoNotDeleteAnyCalls() {
+    insertTwoCallEvents()
+
+    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(500)
+
+    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
+    assertEquals(2, allCallEvents.size)
+    assertEquals(2, allCallEvents[0].record.callId)
+    assertEquals(1, allCallEvents[1].record.callId)
+  }
+
+  @Test
+  fun givenTwoCalls_whenIDeleteOnCallA_thenIOnlyDeleteCallA() {
+    insertTwoCallEvents()
+
+    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(1000)
+
+    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
+    assertEquals(1, allCallEvents.size)
+    assertEquals(2, allCallEvents.first().record.callId)
+  }
+
+  @Test
+  fun givenTwoCalls_whenIDeleteOnCallB_thenIDeleteBothCalls() {
+    insertTwoCallEvents()
+
+    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(2000)
+
+    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
+    assertEquals(0, allCallEvents.size)
+  }
+
+  @Test
+  fun givenTwoCalls_whenIDeleteAfterCallB_thenIDeleteBothCalls() {
+    insertTwoCallEvents()
+
+    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(2500)
+
+    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
+    assertEquals(0, allCallEvents.size)
+  }
+
+  private fun insertTwoCallEvents() {
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      1,
+      groupRecipientId,
+      CallTable.Direction.INCOMING,
+      1000
+    )
+
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      2,
+      groupRecipientId,
+      CallTable.Direction.OUTGOING,
+      2000
+    )
+  }
 }

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

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID
 
 class DistributionListTablesTest {

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

@@ -294,12 +294,12 @@ class GroupTableTest {
   private fun insertPushGroup(
     members: List<DecryptedMember> = listOf(
       DecryptedMember.newBuilder()
-        .setUuid(harness.self.requireServiceId().toByteString())
+        .setAciBytes(harness.self.requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build(),
       DecryptedMember.newBuilder()
-        .setUuid(Recipient.resolved(harness.others[0]).requireServiceId().toByteString())
+        .setAciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build()
@@ -318,14 +318,14 @@ class GroupTableTest {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
 
     val selfMember: DecryptedMember = DecryptedMember.newBuilder()
-      .setUuid(harness.self.requireServiceId().toByteString())
+      .setAciBytes(harness.self.requireAci().toByteString())
       .setJoinedAtRevision(0)
       .setRole(Member.Role.DEFAULT)
       .build()
 
     val otherMembers: List<DecryptedMember> = others.map { id ->
       DecryptedMember.newBuilder()
-        .setUuid(Recipient.resolved(id).requireServiceId().toByteString())
+        .setAciBytes(Recipient.resolved(id).requireAci().toByteString())
         .setJoinedAtRevision(0)
         .setRole(Member.Role.DEFAULT)
         .build()

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

@@ -0,0 +1,176 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import org.junit.Test
+import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireLongOrNull
+import org.signal.core.util.select
+import org.signal.core.util.update
+import org.signal.libsignal.protocol.ecc.Curve
+import org.signal.libsignal.protocol.kem.KEMKeyPair
+import org.signal.libsignal.protocol.kem.KEMKeyType
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import java.util.UUID
+
+class KyberPreKeyTableTest {
+
+  private val aci: ACI = ACI.from(UUID.randomUUID())
+  private val pni: PNI = PNI.from(UUID.randomUUID())
+
+  @Test
+  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
+    insertTestRecord(aci, id = 1)
+    insertTestRecord(aci, id = 2)
+    insertTestRecord(aci, id = 3, staleTime = 42)
+    insertTestRecord(pni, id = 4)
+
+    val now = System.currentTimeMillis()
+    SignalDatabase.kyberPreKeys.markAllStaleIfNecessary(aci, now)
+
+    assertEquals(now, getStaleTime(aci, 1))
+    assertEquals(now, getStaleTime(aci, 2))
+    assertEquals(42L, getStaleTime(aci, 3))
+    assertEquals(0L, getStaleTime(pni, 4))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+    insertTestRecord(aci, id = 4, staleTime = 15)
+    insertTestRecord(aci, id = 5, staleTime = 0)
+
+    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNull(getStaleTime(aci, 2))
+    assertNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
+    insertTestRecord(aci, id = 1, staleTime = 0)
+    insertTestRecord(aci, id = 2, staleTime = 0)
+    insertTestRecord(aci, id = 3, staleTime = 0)
+    insertTestRecord(aci, id = 4, staleTime = 0)
+    insertTestRecord(aci, id = 5, staleTime = 0)
+
+    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 1)
+
+    assertNotNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_respectMinCount() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+    insertTestRecord(aci, id = 4, staleTime = 10)
+    insertTestRecord(aci, id = 5, staleTime = 10)
+
+    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_respectAccount() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+
+    insertTestRecord(pni, id = 4, staleTime = 10)
+    insertTestRecord(pni, id = 5, staleTime = 10)
+
+    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(pni, 4))
+    assertNotNull(getStaleTime(pni, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_ignoreLastResortForMinCount() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+    insertTestRecord(aci, id = 4, staleTime = 10)
+    insertTestRecord(aci, id = 5, staleTime = 10, lastResort = true)
+
+    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_neverDeleteLastResort() {
+    insertTestRecord(aci, id = 1, staleTime = 10, lastResort = true)
+    insertTestRecord(aci, id = 2, staleTime = 10, lastResort = true)
+    insertTestRecord(aci, id = 3, staleTime = 10, lastResort = true)
+
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
+
+    assertNotNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+  }
+
+  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0, lastResort: Boolean = false) {
+    val kemKeyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024)
+    SignalDatabase.kyberPreKeys.insert(
+      serviceId = account,
+      keyId = id,
+      record = KyberPreKeyRecord(
+        id,
+        System.currentTimeMillis(),
+        kemKeyPair,
+        Curve.generateKeyPair().privateKey.calculateSignature(kemKeyPair.publicKey.serialize())
+      ),
+      lastResort = lastResort
+    )
+
+    val count = SignalDatabase.rawDatabase
+      .update(KyberPreKeyTable.TABLE_NAME)
+      .values(KyberPreKeyTable.STALE_TIMESTAMP to staleTime)
+      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
+      .run()
+
+    assertEquals(1, count)
+  }
+
+  private fun getStaleTime(account: ServiceId, id: Int): Long? {
+    return SignalDatabase.rawDatabase
+      .select(KyberPreKeyTable.STALE_TIMESTAMP)
+      .from(KyberPreKeyTable.TABLE_NAME)
+      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
+      .run()
+      .readToSingleObject { it.requireLongOrNull(KyberPreKeyTable.STALE_TIMESTAMP) }
+  }
+}

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

@@ -10,9 +10,8 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -34,7 +33,7 @@ class MessageTableTest_gifts {
     SignalStore.account().setAci(localAci)
     SignalStore.account().setPni(localPni)
 
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
   }
 
   @Test
@@ -82,7 +81,7 @@ class MessageTableTest_gifts {
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 2,
       giftBadge = GiftBadge.getDefaultInstance()
     )
 
@@ -102,7 +101,7 @@ class MessageTableTest_gifts {
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 2,
       giftBadge = GiftBadge.getDefaultInstance()
     )
 
@@ -121,13 +120,13 @@ class MessageTableTest_gifts {
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 2,
       giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 3,
       giftBadge = null
     )
 
@@ -146,13 +145,13 @@ class MessageTableTest_gifts {
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 2,
       giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 3,
       giftBadge = null
     )
 
@@ -171,13 +170,13 @@ class MessageTableTest_gifts {
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 2,
       giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
+      sentTimeMillis = 3,
       giftBadge = null
     )
 

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

@@ -17,7 +17,6 @@ object MmsHelper {
     recipient: Recipient = Recipient.UNKNOWN,
     body: String = "body",
     sentTimeMillis: Long = System.currentTimeMillis(),
-    subscriptionId: Int = -1,
     expiresIn: Long = 0,
     viewOnce: Boolean = false,
     distributionType: Int = ThreadTable.DistributionTypes.DEFAULT,
@@ -32,7 +31,6 @@ object MmsHelper {
       recipient = recipient,
       body = body,
       timestamp = sentTimeMillis,
-      subscriptionId = subscriptionId,
       expiresIn = expiresIn,
       viewOnce = viewOnce,
       distributionType = distributionType,

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

@@ -16,9 +16,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 
@@ -45,7 +44,7 @@ class MmsTableTest_stories {
     SignalStore.account().setPni(localPni)
 
     myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
     releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
 
     SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
@@ -253,8 +252,7 @@ class MmsTableTest_stories {
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
+      storyType = StoryType.STORY_WITH_REPLIES
     )
 
     // WHEN
@@ -319,8 +317,7 @@ class MmsTableTest_stories {
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
+      storyType = StoryType.STORY_WITH_REPLIES
     )
 
     MmsHelper.insert(
@@ -331,7 +328,7 @@ class MmsTableTest_stories {
         receivedTimeMillis = 202,
         parentStoryId = ParentStoryId.GroupReply(groupStoryId)
       ),
-      -1
+      SignalDatabase.threads.getOrCreateThreadIdFor(myStory, ThreadTable.DistributionTypes.DEFAULT)
     )
 
     // WHEN

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

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import org.junit.Test
+import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireLongOrNull
+import org.signal.core.util.select
+import org.signal.core.util.update
+import org.signal.libsignal.protocol.ecc.Curve
+import org.signal.libsignal.protocol.state.PreKeyRecord
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import java.util.UUID
+
+class OneTimePreKeyTableTest {
+
+  private val aci: ACI = ACI.from(UUID.randomUUID())
+  private val pni: PNI = PNI.from(UUID.randomUUID())
+
+  @Test
+  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
+    insertTestRecord(aci, id = 1)
+    insertTestRecord(aci, id = 2)
+    insertTestRecord(aci, id = 3, staleTime = 42)
+    insertTestRecord(pni, id = 4)
+
+    val now = System.currentTimeMillis()
+    SignalDatabase.oneTimePreKeys.markAllStaleIfNecessary(aci, now)
+
+    assertEquals(now, getStaleTime(aci, 1))
+    assertEquals(now, getStaleTime(aci, 2))
+    assertEquals(42L, getStaleTime(aci, 3))
+    assertEquals(0L, getStaleTime(pni, 4))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+    insertTestRecord(aci, id = 4, staleTime = 15)
+    insertTestRecord(aci, id = 5, staleTime = 0)
+
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNull(getStaleTime(aci, 2))
+    assertNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
+    insertTestRecord(aci, id = 1, staleTime = 0)
+    insertTestRecord(aci, id = 2, staleTime = 0)
+    insertTestRecord(aci, id = 3, staleTime = 0)
+    insertTestRecord(aci, id = 4, staleTime = 0)
+    insertTestRecord(aci, id = 5, staleTime = 0)
+
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 0)
+
+    assertNotNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_respectMinCount() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+    insertTestRecord(aci, id = 4, staleTime = 10)
+    insertTestRecord(aci, id = 5, staleTime = 10)
+
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(aci, 4))
+    assertNotNull(getStaleTime(aci, 5))
+  }
+
+  @Test
+  fun deleteAllStaleBefore_respectAccount() {
+    insertTestRecord(aci, id = 1, staleTime = 10)
+    insertTestRecord(aci, id = 2, staleTime = 10)
+    insertTestRecord(aci, id = 3, staleTime = 10)
+
+    insertTestRecord(pni, id = 4, staleTime = 10)
+    insertTestRecord(pni, id = 5, staleTime = 10)
+
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
+
+    assertNull(getStaleTime(aci, 1))
+    assertNotNull(getStaleTime(aci, 2))
+    assertNotNull(getStaleTime(aci, 3))
+    assertNotNull(getStaleTime(pni, 4))
+    assertNotNull(getStaleTime(pni, 5))
+  }
+
+  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0) {
+    SignalDatabase.oneTimePreKeys.insert(
+      serviceId = account,
+      keyId = id,
+      record = PreKeyRecord(id, Curve.generateKeyPair())
+    )
+
+    val count = SignalDatabase.rawDatabase
+      .update(OneTimePreKeyTable.TABLE_NAME)
+      .values(OneTimePreKeyTable.STALE_TIMESTAMP to staleTime)
+      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
+      .run()
+
+    assertEquals(1, count)
+  }
+
+  private fun getStaleTime(account: ServiceId, id: Int): Long? {
+    return SignalDatabase.rawDatabase
+      .select(OneTimePreKeyTable.STALE_TIMESTAMP)
+      .from(OneTimePreKeyTable.TABLE_NAME)
+      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
+      .run()
+      .readToSingleObject { it.requireLongOrNull(OneTimePreKeyTable.STALE_TIMESTAMP) }
+  }
+}

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

@@ -13,8 +13,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
@@ -24,14 +24,14 @@ class RecipientTableTest {
   val harness = SignalActivityRule()
 
   @Test
-  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIDoNotExpectHiddenToBeReturned() {
+  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIExpectHiddenToBeReturned() {
     val hiddenRecipient = harness.others[0]
     SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
     SignalDatabase.recipients.markHidden(hiddenRecipient)
 
     val results = SignalDatabase.recipients.queryAllContacts("Hidden")!!
 
-    assertEquals(0, results.count)
+    assertEquals(1, results.count)
   }
 
   @Test
@@ -173,10 +173,10 @@ class RecipientTableTest {
 
     SignalDatabase.recipients.markUnregistered(mainId)
 
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
 
     val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
 
     assertEquals(mainId, byAci)
     assertEquals(byE164, byPni)
@@ -192,10 +192,10 @@ class RecipientTableTest {
 
     SignalDatabase.recipients.splitForStorageSync(mainRecord.storageId!!)
 
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
 
     val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
 
     assertEquals(mainId, byAci)
     assertEquals(byE164, byPni)

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.storage.StorageRecordUpdate
+import org.thoughtcrime.securesms.storage.StorageSyncModels
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.util.MessageTableTestUtils
+import org.whispersystems.signalservice.api.storage.SignalContactRecord
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class RecipientTableTest_applyStorageSyncContactUpdate {
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun insertMessageOnVerifiedToDefault() {
+    // GIVEN
+    val identities = ApplicationDependencies.getProtocolStore().aci().identities()
+    val other = Recipient.resolved(harness.others[0])
+
+    MmsHelper.insert(recipient = other)
+    identities.setVerified(other.id, harness.othersKeys[0].publicKey, IdentityTable.VerifiedStatus.VERIFIED)
+
+    val oldRecord: SignalContactRecord = StorageSyncModels.localToRemoteRecord(SignalDatabase.recipients.getRecordForSync(harness.others[0])!!).contact.get()
+
+    val newProto = oldRecord
+      .toProto()
+      .toBuilder()
+      .setIdentityState(ContactRecord.IdentityState.DEFAULT)
+      .build()
+    val newRecord = SignalContactRecord(oldRecord.id, newProto)
+
+    val update = StorageRecordUpdate<SignalContactRecord>(oldRecord, newRecord)
+
+    // WHEN
+    val oldVerifiedStatus: IdentityTable.VerifiedStatus = identities.getIdentityRecord(other.id).get().verifiedStatus
+    SignalDatabase.recipients.applyStorageSyncContactUpdate(update)
+    val newVerifiedStatus: IdentityTable.VerifiedStatus = identities.getIdentityRecord(other.id).get().verifiedStatus
+
+    // THEN
+    oldVerifiedStatus assertIs IdentityTable.VerifiedStatus.VERIFIED
+    newVerifiedStatus assertIs IdentityTable.VerifiedStatus.DEFAULT
+
+    val messages = MessageTableTestUtils.getMessages(SignalDatabase.threads.getThreadIdFor(other.id)!!)
+    messages.first().isIdentityDefault assertIs true
+  }
+}

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

@@ -7,6 +7,7 @@ import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Assert
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
@@ -14,6 +15,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.SqlUtil
+import org.signal.core.util.exists
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
@@ -36,14 +38,13 @@ import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.Optional
 import java.util.UUID
 
@@ -84,6 +85,30 @@ class RecipientTableTest_getAndPossiblyMerge {
       val record = SignalDatabase.recipients.getRecord(id)
       assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
     }
+
+    test("e164+pni insert") {
+      val id = process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
+    }
+
+    test("e164+aci insert") {
+      val id = process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
+    }
+
+    test("e164+pni+aci insert") {
+      val id = process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
+    }
   }
 
   @Test
@@ -93,9 +118,9 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, null, null)
     }
 
-    test("no match, e164 and pni") {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
+    test("no match, pni-only") {
+      process(null, PNI_A, null)
+      expect(null, PNI_A, null)
     }
 
     test("no match, aci-only") {
@@ -103,6 +128,11 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(null, null, ACI_A)
     }
 
+    test("no match, e164 and pni") {
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+    }
+
     test("no match, e164 and aci") {
       process(E164_A, null, ACI_A)
       expect(E164_A, null, ACI_A)
@@ -167,6 +197,12 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectSessionSwitchoverEvent(E164_A)
     }
 
+    test("e164 and pni matches, all provided, new aci, existing pni session, pni-verified") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A, pniVerified = true)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
     test("e164 and aci matches, all provided, new pni") {
       given(E164_A, null, ACI_A)
       process(E164_A, PNI_A, ACI_A)
@@ -309,6 +345,26 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
+    test("steal, pni is changed") {
+      given(E164_A, PNI_B, ACI_A)
+      given(E164_B, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expect(E164_B, null, null)
+    }
+
+    test("steal, pni is changed, aci left behind") {
+      given(E164_B, PNI_A, ACI_A)
+      given(E164_A, PNI_B, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_B, null, ACI_A)
+      expect(E164_A, PNI_A, null)
+    }
+
     test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
       given(E164_A, PNI_B, null)
       given(E164_B, PNI_A, null)
@@ -353,7 +409,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
-    test("steal, e164 & pni+e164, no aci provided") {
+    test("steal, e164 & pni+e164, no aci provided, pni session exists") {
       val id1 = given(E164_A, null, null)
       val id2 = given(E164_B, PNI_A, null, pniSession = true)
 
@@ -366,6 +422,16 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectSessionSwitchoverEvent(id2, E164_B)
     }
 
+    test("steal, e164 & pni+e164, no aci provided, no pni session") {
+      given(E164_A, null, null)
+      given(E164_B, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+    }
+
     test("steal, e164+pni+aci & e164+aci, no pni provided, change number") {
       given(E164_A, PNI_A, ACI_A)
       given(E164_B, null, ACI_B)
@@ -378,6 +444,64 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
+    test("steal, e164+aci & aci, no pni provided, existing aci session") {
+      given(E164_A, null, ACI_A, aciSession = true)
+      given(null, null, ACI_B)
+
+      process(E164_A, null, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, null, ACI_B)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
+    test("steal, e164+pni+aci & aci, no pni provided, existing aci session") {
+      given(E164_A, PNI_A, ACI_A, aciSession = true)
+      given(null, null, ACI_B)
+
+      process(E164_A, null, ACI_B)
+
+      expect(null, PNI_A, ACI_A)
+      expect(E164_A, null, ACI_B)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
+    test("steal, e164+pni+aci & aci, no pni provided, existing pni session") {
+      given(E164_A, PNI_A, ACI_A, pniSession = true)
+      given(null, null, ACI_B)
+
+      process(E164_A, null, ACI_B)
+
+      expect(null, PNI_A, ACI_A)
+      expect(E164_A, null, ACI_B)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
+    test("steal, e164+pni & aci, no pni provided, no pni session") {
+      given(E164_A, PNI_A, null)
+      given(null, null, ACI_A)
+
+      process(E164_A, null, ACI_A)
+
+      expect(null, PNI_A, null)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("steal, e164+pni & aci, no pni provided, pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      given(null, null, ACI_A)
+
+      process(E164_A, null, ACI_A)
+
+      expect(null, PNI_A, null)
+      expect(E164_A, null, ACI_A)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
     test("merge, e164 & pni & aci, all provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -502,7 +626,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent(E164_A)
     }
 
-    test("merge, e164+pni & aci, pni session, thread merge shadows") {
+    test("merge, e164+pni & aci, pni session, thread merge shadows SSE") {
       given(E164_A, PNI_A, null, pniSession = true)
       given(null, null, ACI_A)
 
@@ -600,6 +724,18 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent(E164_A)
     }
 
+    test("merge, e164 + pni reassigned, aci abandoned") {
+      given(E164_A, PNI_A, ACI_A)
+      given(E164_B, PNI_B, ACI_B)
+
+      process(E164_A, PNI_A, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, PNI_A, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+
     test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
       given(E164_SELF, null, ACI_SELF)
       given(null, null, ACI_A)
@@ -621,6 +757,22 @@ class RecipientTableTest_getAndPossiblyMerge {
       process(E164_A, null, ACI_SELF, changeSelf = true)
       expect(E164_A, null, ACI_SELF)
     }
+
+    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
+      given(E164_SELF, PNI_SELF, ACI_SELF)
+
+      process(E164_SELF, PNI_A, ACI_A)
+
+      expect(E164_SELF, PNI_SELF, ACI_SELF)
+    }
+
+    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
+      given(E164_SELF, PNI_A, ACI_SELF)
+
+      process(E164_SELF, PNI_SELF, ACI_A)
+
+      expect(E164_SELF, PNI_A, ACI_SELF)
+    }
   }
 
   /**
@@ -768,9 +920,15 @@ class RecipientTableTest_getAndPossiblyMerge {
   }
 
   private fun identityKey(value: Byte): IdentityKey {
+    val byteArray = ByteArray(32)
+    byteArray[0] = value
+    return identityKey(byteArray)
+  }
+
+  private fun identityKey(value: ByteArray): IdentityKey {
     val bytes = ByteArray(33)
     bytes[0] = 0x05
-    bytes[1] = value
+    value.copyInto(bytes, 1)
     return IdentityKey(bytes)
   }
 
@@ -858,6 +1016,7 @@ class RecipientTableTest_getAndPossiblyMerge {
         }
 
       ApplicationDependencies.getRecipientCache().clear()
+      ApplicationDependencies.getRecipientCache().clearSelf()
       RecipientId.clearCache()
     }
 
@@ -866,14 +1025,15 @@ class RecipientTableTest_getAndPossiblyMerge {
       pni: PNI?,
       aci: ACI?,
       createThread: Boolean = true,
-      pniSession: Boolean = false
+      pniSession: Boolean = false,
+      aciSession: Boolean = false
     ): RecipientId {
       val id = insert(e164, pni, aci)
       generatedIds += id
       if (createThread) {
         // Create a thread and throw a dummy message in it so it doesn't get automatically deleted
-        SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(id))
-        SignalDatabase.messages.insertMessageInbox(IncomingEncryptedMessage(IncomingTextMessage(id, 1, 0, 0, 0, "", Optional.empty(), 0, false, ""), ""))
+        val result = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = id, time = (Math.random() * 10000000).toLong(), body = "1"))
+        SignalDatabase.threads.markAsActiveEarly(result.get().threadId)
       }
 
       if (pniSession) {
@@ -884,11 +1044,42 @@ class RecipientTableTest_getAndPossiblyMerge {
         SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
       }
 
+      if (aciSession) {
+        if (aci == null) {
+          throw IllegalArgumentException("aciSession = true but aci is null!")
+        }
+
+        SignalDatabase.sessions.store(aci, SignalProtocolAddress(aci.toString(), 1), SessionRecord())
+      }
+
+      if (aci != null) {
+        SignalDatabase.identities.saveIdentity(
+          addressName = aci.toString(),
+          recipientId = id,
+          identityKey = identityKey(Util.getSecretBytes(32)),
+          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
+          firstUse = true,
+          timestamp = 0,
+          nonBlockingApproval = false
+        )
+      }
+      if (pni != null) {
+        SignalDatabase.identities.saveIdentity(
+          addressName = pni.toString(),
+          recipientId = id,
+          identityKey = identityKey(Util.getSecretBytes(32)),
+          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
+          firstUse = true,
+          timestamp = 0,
+          nonBlockingApproval = false
+        )
+      }
+
       return id
     }
 
     fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false, pniVerified: Boolean = false): RecipientId {
-      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
+      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(aci = aci, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
       generatedIds += outputRecipientId
       return outputRecipientId
     }
@@ -902,15 +1093,15 @@ class RecipientTableTest_getAndPossiblyMerge {
       val expected = RecipientTuple(
         e164 = e164,
         pni = pni,
-        serviceId = aci ?: pni
+        aci = aci
       )
       val actual = RecipientTuple(
         e164 = recipient.e164.orElse(null),
         pni = recipient.pni.orElse(null),
-        serviceId = recipient.serviceId.orElse(null)
+        aci = recipient.aci.orElse(null)
       )
 
-      assertEquals(expected, actual)
+      assertEquals("Recipient $id did not match expected result!", expected, actual)
     }
 
     fun expectDeleted() {
@@ -918,21 +1109,21 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
 
     fun expectDeleted(id: RecipientId) {
-      SignalDatabase.rawDatabase
-        .select("1")
-        .from(RecipientTable.TABLE_NAME)
+      val found = SignalDatabase.rawDatabase
+        .exists(RecipientTable.TABLE_NAME)
         .where("${RecipientTable.ID} = ?", id)
         .run()
-        .use { !it.moveToFirst() }
+
+      assertFalse("Expected $id to be deleted, but it's still present!", found)
     }
 
     fun expectChangeNumberEvent() {
-      assertEquals(1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals("Missing change number event!", 1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
       changeNumberExpected = true
     }
 
     fun expectNoChangeNumberEvent() {
-      assertEquals(0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals("Unexpected change number event!", 0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
       changeNumberExpected = false
     }
 
@@ -942,42 +1133,39 @@ class RecipientTableTest_getAndPossiblyMerge {
 
     fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
       val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
-      assertNotNull(event)
+      assertNotNull("Missing session switchover event! Expected one with e164 = $e164", event)
       assertEquals(e164, event!!.e164)
       sessionSwitchoverExpected = true
     }
 
     fun expectNoSessionSwitchoverEvent() {
-      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
+      assertNull("Unexpected session switchover event!", getLatestSessionSwitchoverEvent(outputRecipientId))
     }
 
     fun expectThreadMergeEvent(previousE164: String) {
       val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
-      assertNotNull(event)
-      assertEquals(previousE164, event!!.previousE164)
+      assertNotNull("Missing thread merge event! Expected one with e164 = $previousE164", event)
+      assertEquals("E164 on thread merge event doesn't match!", previousE164, event!!.previousE164)
       threadMergeExpected = true
     }
 
     fun expectNoThreadMergeEvent() {
-      assertNull(getLatestThreadMergeEvent(outputRecipientId))
+      assertNull("Unexpected thread merge event!", getLatestThreadMergeEvent(outputRecipientId))
     }
 
     private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
-      val serviceIdString: String? = (aci ?: pni)?.toString()
-      val pniString: String? = pni?.toString()
-
       val id: Long = SignalDatabase.rawDatabase.insert(
         RecipientTable.TABLE_NAME,
         null,
         contentValuesOf(
-          RecipientTable.PHONE to e164,
-          RecipientTable.SERVICE_ID to serviceIdString,
-          RecipientTable.PNI_COLUMN to pniString,
+          RecipientTable.E164 to e164,
+          RecipientTable.ACI_COLUMN to aci?.toString(),
+          RecipientTable.PNI_COLUMN to pni?.toString(),
           RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
         )
       )
 
-      assertTrue("Failed to insert! E164: $e164, ServiceId: $serviceIdString, PNI: $pniString", id > 0)
+      assertTrue("Failed to insert! E164: $e164, ACI: $aci, PNI: $pni", id > 0)
 
       return RecipientId.from(id)
     }
@@ -986,14 +1174,14 @@ class RecipientTableTest_getAndPossiblyMerge {
   data class RecipientTuple(
     val e164: String?,
     val pni: PNI?,
-    val serviceId: ServiceId?
+    val aci: ACI?
   ) {
 
     /**
      * The intent here is to give nice diffs with the name of the constants rather than the values.
      */
     override fun toString(): String {
-      return "(${e164.e164String()}, ${pni.pniString()}, ${serviceId.serviceIdString()})"
+      return "(${e164.e164String()}, ${pni.pniString()}, ${aci.aciString()})"
     }
 
     private fun String?.e164String(): String {
@@ -1017,12 +1205,9 @@ class RecipientTableTest_getAndPossiblyMerge {
       } ?: "null"
     }
 
-    private fun ServiceId?.serviceIdString(): String {
+    private fun ACI?.aciString(): String {
       return this?.let {
         when (it) {
-          PNI_A -> "PNI_A"
-          PNI_B -> "PNI_B"
-          PNI_SELF -> "PNI_SELF"
           ACI_A -> "ACI_A"
           ACI_B -> "ACI_B"
           ACI_SELF -> "ACI_SELF"

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

@@ -21,9 +21,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.Optional
 import java.util.UUID
 
@@ -283,8 +282,8 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
   }
 
   companion object {
-    private val aliceServiceId: ServiceId = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    private val bobServiceId: ServiceId = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
+    private val aliceServiceId: ACI = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
+    private val bobServiceId: ACI = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
 
     private val masterKey = GroupMasterKey(Hex.fromStringCondensed("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"))
     private val groupId = GroupId.v2(masterKey)

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

@@ -12,19 +12,24 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
 class StorySendTableTest {
 
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 0, createGroup = false)
+
   private val distributionId1 = DistributionId.from(UUID.randomUUID())
   private val distributionId2 = DistributionId.from(UUID.randomUUID())
   private val distributionId3 = DistributionId.from(UUID.randomUUID())
@@ -460,7 +465,7 @@ class StorySendTableTest {
 
   private fun makeRecipients(count: Int): List<RecipientId> {
     return (1..count).map {
-      SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID()))
+      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
     }
   }
 }

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

@@ -0,0 +1,144 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import java.util.UUID
+
+@Suppress("ClassName")
+class ThreadTableTest_active {
+
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule()
+
+  private lateinit var recipient: Recipient
+
+  @Before
+  fun setUp() {
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
+  }
+
+  @Test
+  fun givenActiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectThread() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+
+    SignalDatabase.threads.getUnarchivedConversationList(
+      ConversationFilter.OFF,
+      false,
+      0,
+      10
+    ).use { threads ->
+      assertEquals(1, threads.count)
+
+      val record = ThreadTable.StaticReader(threads, InstrumentationRegistry.getInstrumentation().context).getNext()
+
+      assertNotNull(record)
+      assertEquals(record!!.recipient.id, recipient.id)
+    }
+  }
+
+  @Test
+  fun givenInactiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+    SignalDatabase.threads.deleteConversation(threadId)
+
+    SignalDatabase.threads.getUnarchivedConversationList(
+      ConversationFilter.OFF,
+      false,
+      0,
+      10
+    ).use { threads ->
+      assertEquals(0, threads.count)
+    }
+
+    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    assertEquals(threadId2, threadId)
+  }
+
+  @Test
+  fun givenActiveArchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+    SignalDatabase.threads.setArchived(setOf(threadId), true)
+
+    SignalDatabase.threads.getUnarchivedConversationList(
+      ConversationFilter.OFF,
+      false,
+      0,
+      10
+    ).use { threads ->
+      assertEquals(0, threads.count)
+    }
+  }
+
+  @Test
+  fun givenActiveArchivedThread_whenIGetArchivedConversationList_thenIExpectThread() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+    SignalDatabase.threads.setArchived(setOf(threadId), true)
+
+    SignalDatabase.threads.getArchivedConversationList(
+      ConversationFilter.OFF,
+      0,
+      10
+    ).use { threads ->
+      assertEquals(1, threads.count)
+    }
+  }
+
+  @Test
+  fun givenInactiveArchivedThread_whenIGetArchivedConversationList_thenIExpectNoThread() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+    SignalDatabase.threads.deleteConversation(threadId)
+    SignalDatabase.threads.setArchived(setOf(threadId), true)
+
+    SignalDatabase.threads.getArchivedConversationList(
+      ConversationFilter.OFF,
+      0,
+      10
+    ).use { threads ->
+      assertEquals(0, threads.count)
+    }
+
+    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    assertEquals(threadId2, threadId)
+  }
+
+  @Test
+  fun givenActiveArchivedThread_whenIDeactivateThread_thenIExpectNoMessages() {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+
+    SignalDatabase.messages.getConversation(threadId).use {
+      assertEquals(1, it.count)
+    }
+
+    SignalDatabase.threads.deleteConversation(threadId)
+
+    SignalDatabase.messages.getConversation(threadId).use {
+      assertEquals(0, it.count)
+    }
+  }
+}

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

@@ -9,7 +9,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -23,7 +23,7 @@ class ThreadTableTest_pinned {
 
   @Before
   fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
   }
 
   @Test

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

@@ -10,7 +10,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -25,7 +25,7 @@ class ThreadTableTest_recents {
 
   @Before
   fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
   }
 
   @Test

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

@@ -33,6 +33,7 @@ import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupSe
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url
 import java.security.KeyStore
 import java.util.Optional
 
@@ -74,20 +75,20 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
 
     serviceTrustStore = SignalServiceTrustStore(application)
     uncensoredConfiguration = SignalServiceConfiguration(
-      arrayOf(SignalServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      mapOf(
+      signalServiceUrls = arrayOf(SignalServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      signalCdnUrlMap = mapOf(
         0 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
         2 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT))
       ),
-      arrayOf(SignalKeyBackupServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      emptyArray(),
-      emptyList(),
-      Optional.of(SignalServiceNetworkAccess.DNS),
-      Optional.empty(),
-      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
-      Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS)
+      signalKeyBackupServiceUrls = arrayOf(SignalKeyBackupServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      signalStorageUrls = arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      signalCdsiUrls = arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      signalSvr2Urls = arrayOf(SignalSvr2Url(baseUrl, serviceTrustStore, "localhost", ConnectionSpec.CLEARTEXT)),
+      networkInterceptors = emptyList(),
+      dns = Optional.of(SignalServiceNetworkAccess.DNS),
+      signalProxy = Optional.empty(),
+      zkGroupServerPublicParams = Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
+      genericServerPublicParams = Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS)
     )
 
     serviceNetworkAccessMock = mock {

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt

@@ -1,212 +0,0 @@
-package org.thoughtcrime.securesms.jobs
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.libsignal.protocol.ecc.Curve
-import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Get
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
-import org.thoughtcrime.securesms.testing.parsedRequestBody
-import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts
-import org.whispersystems.signalservice.internal.push.PreKeyState
-
-@RunWith(AndroidJUnit4::class)
-class PreKeysSyncJobTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private val aciPreKeyMeta: PreKeyMetadataStore
-    get() = SignalStore.account().aciPreKeys
-
-  private val pniPreKeyMeta: PreKeyMetadataStore
-    get() = SignalStore.account().pniPreKeys
-
-  private lateinit var job: PreKeysSyncJob
-
-  @Before
-  fun setUp() {
-    job = PreKeysSyncJob()
-  }
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  /**
-   * Create signed prekeys for both identities when both do not have registered prekeys according
-   * to our local state.
-   */
-  @Test
-  fun runWithoutRegisteredKeysForBothIdentities() {
-    // GIVEN
-    aciPreKeyMeta.isSignedPreKeyRegistered = false
-    pniPreKeyMeta.isSignedPreKeyRegistered = false
-
-    lateinit var aciSignedPreKey: SignedPreKeyEntity
-    lateinit var pniSignedPreKey: SignedPreKeyEntity
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v2/keys/signed?identity=aci") { r ->
-        aciSignedPreKey = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Put("/v2/keys/signed?identity=pni") { r ->
-        pniSignedPreKey = r.parsedRequestBody()
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    aciPreKeyMeta.isSignedPreKeyRegistered assertIs true
-    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
-
-    val aciVerifySignatureResult = Curve.verifySignature(
-      ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.publicKey,
-      aciSignedPreKey.publicKey.serialize(),
-      aciSignedPreKey.signature
-    )
-    aciVerifySignatureResult assertIs true
-
-    val pniVerifySignatureResult = Curve.verifySignature(
-      ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.publicKey,
-      pniSignedPreKey.publicKey.serialize(),
-      pniSignedPreKey.signature
-    )
-    pniVerifySignatureResult assertIs true
-  }
-
-  /**
-   * With 100 prekeys registered for each identity, do nothing.
-   */
-  @Test
-  fun runWithRegisteredKeysForBothIdentities() {
-    // GIVEN
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(100, 100)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(OneTimePreKeyCounts(100, 100)) }
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIs currentPniKeyId
-  }
-
-  /**
-   * With 100 prekeys registered for ACI, but no PNI prekeys registered according to local state,
-   * do nothing for ACI but create PNI prekeys and update local state.
-   */
-  @Test
-  fun runWithRegisteredKeysForAciIdentityOnly() {
-    // GIVEN
-    pniPreKeyMeta.isSignedPreKeyRegistered = false
-
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(100, 100)) },
-      Put("/v2/keys/signed?identity=pni") { MockResponse().success() }
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
-    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
-  }
-
-  /**
-   * With <10 prekeys registered for each identity, upload new.
-   */
-  @Test
-  fun runWithLowNumberOfRegisteredKeysForBothIdentities() {
-    // GIVEN
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    val currentNextAciPreKeyId = aciPreKeyMeta.nextEcOneTimePreKeyId
-    val currentNextPniPreKeyId = pniPreKeyMeta.nextEcOneTimePreKeyId
-
-    lateinit var aciPreKeyStateRequest: PreKeyState
-    lateinit var pniPreKeyStateRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(OneTimePreKeyCounts(5, 5)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(OneTimePreKeyCounts(5, 5)) },
-      Put("/v2/keys/?identity=aci") { r ->
-        aciPreKeyStateRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Put("/v2/keys/?identity=pni") { r ->
-        pniPreKeyStateRequest = r.parsedRequestBody()
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-    aciPreKeyMeta.activeSignedPreKeyId assertIsNot currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
-
-    aciPreKeyMeta.nextEcOneTimePreKeyId assertIsNot currentNextAciPreKeyId
-    pniPreKeyMeta.nextEcOneTimePreKeyId assertIsNot currentNextPniPreKeyId
-
-    ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.let { aciIdentityKey ->
-      aciPreKeyStateRequest.identityKey assertIs aciIdentityKey
-
-      val verifySignatureResult = Curve.verifySignature(
-        aciIdentityKey.publicKey,
-        aciPreKeyStateRequest.signedPreKey.publicKey.serialize(),
-        aciPreKeyStateRequest.signedPreKey.signature
-      )
-      verifySignatureResult assertIs true
-    }
-
-    ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.let { pniIdentityKey ->
-      pniPreKeyStateRequest.identityKey assertIs pniIdentityKey
-
-      val verifySignatureResult = Curve.verifySignature(
-        pniIdentityKey.publicKey,
-        pniPreKeyStateRequest.signedPreKey.publicKey.serialize(),
-        pniPreKeyStateRequest.signedPreKey.signature
-      )
-      verifySignatureResult assertIs true
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt

@@ -12,6 +12,7 @@ import org.signal.libsignal.usernames.Username
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.Delete
 import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.Put
 import org.thoughtcrime.securesms.testing.SignalActivityRule
@@ -36,6 +37,11 @@ class RefreshOwnProfileJob__checkUsernameIsInSyncTest {
 
   @Test
   fun givenNoLocalUsername_whenICheckUsernameIsInSync_thenIExpectNoFailures() {
+    // GIVEN
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Delete("/v1/accounts/username_hash") { MockResponse().success() }
+    )
+
     // WHEN
     RefreshOwnProfileJob.checkUsernameIsInSync()
   }

app/src/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java

@@ -22,10 +22,10 @@ public final class PinHashing_hashPin_Test {
   @Test
   public void argon2_hashed_pin_password() throws IOException {
     String    pin       = "password";
-    byte[]    backupId  = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
+    byte[]    salt      = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, new byte[]{});
+    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
     KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
 
     assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
@@ -40,10 +40,10 @@ public final class PinHashing_hashPin_Test {
   @Test
   public void argon2_hashed_pin_another_password() throws IOException {
     String    pin       = "anotherpassword";
-    byte[]    backupId  = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
+    byte[]    salt      = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("88a787415a2ecd79da0d1016a82a27c5c695c9a19b88b0aa1d35683280aa9a67"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, new byte[]{});
+    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
     KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
 
     assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
@@ -58,10 +58,10 @@ public final class PinHashing_hashPin_Test {
   @Test
   public void argon2_hashed_pin_password_with_spaces_diacritics_and_non_arabic_numerals() throws IOException {
     String    pin       = " Pass६örd ";
-    byte[]    backupId  = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
+    byte[]    salt      = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("9571f3fde1e58588ba49bcf82be1b301ca3859a6f59076f79a8f47181ef952bf"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, new byte[]{});
+    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
     KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
 
     assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
@@ -78,10 +78,10 @@ public final class PinHashing_hashPin_Test {
   @Test
   public void argon2_hashed_pin_password_with_just_non_arabic_numerals() throws IOException {
     String    pin       = " ६१८ ";
-    byte[]    backupId  = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
+    byte[]    salt      = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("0432d735b32f66d0e3a70d4f9cc821a8529521a4937d26b987715d8eff4e4c54"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, new byte[]{});
+    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
     KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
 
     assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());

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

@@ -46,13 +46,13 @@ class EditMessageSyncProcessorTest {
   @get:Rule
   val harness = SignalActivityRule()
 
-  private lateinit var processorV2: MessageContentProcessorV2
+  private lateinit var processorV2: MessageContentProcessor
   private lateinit var testResult: TestResults
   private var envelopeTimestamp: Long = 0
 
   @Before
   fun setup() {
-    processorV2 = MessageContentProcessorV2(harness.context)
+    processorV2 = MessageContentProcessor(harness.context)
     envelopeTimestamp = System.currentTimeMillis()
     testResult = TestResults()
   }
@@ -70,7 +70,7 @@ class EditMessageSyncProcessorTest {
       val syncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
         SignalServiceProtos.SyncMessage.newBuilder().setSent(
           SignalServiceProtos.SyncMessage.Sent.newBuilder()
-            .setDestinationUuid(metadata.destinationServiceId.toString())
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
             .setTimestamp(originalTimestamp)
             .setExpirationStartTimestamp(originalTimestamp)
             .setMessage(content.dataMessage)
@@ -89,7 +89,7 @@ class EditMessageSyncProcessorTest {
       val editSyncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
         SignalServiceProtos.SyncMessage.newBuilder().setSent(
           SignalServiceProtos.SyncMessage.Sent.newBuilder()
-            .setDestinationUuid(metadata.destinationServiceId.toString())
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
             .setTimestamp(editTimestamp)
             .setExpirationStartTimestamp(editTimestamp)
             .setEditMessage(

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

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

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

@@ -1,313 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import android.database.Cursor
-import android.util.Base64
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.ThreadUtil
-import org.signal.core.util.readToList
-import org.signal.core.util.select
-import org.signal.core.util.withinTransaction
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.ThreadTable
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Entry
-import org.thoughtcrime.securesms.testing.InMemoryLogger
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.api.messages.SignalServiceContent
-import org.whispersystems.signalservice.api.messages.SignalServiceMetadata
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos
-import org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer
-import org.whispersystems.signalservice.internal.serialize.SignalServiceMetadataProtobufSerializer
-import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
-import java.util.Optional
-
-@RunWith(AndroidJUnit4::class)
-class MessageContentProcessorTestV2 {
-
-  companion object {
-    private val TAGS = listOf(MessageContentProcessor.TAG, MessageContentProcessorV2.TAG, AttachmentTable.TAG)
-
-    private val GENERALIZE_TAG = mapOf(
-      MessageContentProcessor.TAG to "MCP",
-      MessageContentProcessorV2.TAG to "MCP",
-      AttachmentTable.TAG to AttachmentTable.TAG
-    )
-
-    private val IGNORE_MESSAGE_COLUMNS = listOf(
-      MessageTable.DATE_RECEIVED,
-      MessageTable.NOTIFIED_TIMESTAMP,
-      MessageTable.REACTIONS_LAST_SEEN,
-      MessageTable.NOTIFIED
-    )
-
-    private val IGNORE_ATTACHMENT_COLUMNS = listOf(
-      AttachmentTable.UNIQUE_ID,
-      AttachmentTable.TRANSFER_FILE
-    )
-  }
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var processorV1: MessageContentProcessor
-  private lateinit var processorV2: MessageContentProcessorV2
-  private lateinit var testResult: TestResults
-  private var envelopeTimestamp: Long = 0
-
-  @Before
-  fun setup() {
-    processorV1 = MessageContentProcessor(harness.context)
-    processorV2 = MessageContentProcessorV2(harness.context)
-    envelopeTimestamp = System.currentTimeMillis()
-    testResult = TestResults()
-  }
-
-  @Test
-  fun textMessage() {
-    var start = envelopeTimestamp
-
-    val messages: List<TestMessage> = (0 until 100).map {
-      start += 200
-      TestMessage(
-        envelope = MessageContentFuzzer.envelope(start),
-        content = MessageContentFuzzer.fuzzTextMessage(),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
-      )
-    }
-
-    testResult.runV2(messages)
-    testResult.runV1(messages)
-
-    testResult.assert()
-  }
-
-  @Test
-  fun mediaMessage() {
-    var start = envelopeTimestamp
-
-    val textMessages: List<TestMessage> = (0 until 10).map {
-      start += 200
-      TestMessage(
-        envelope = MessageContentFuzzer.envelope(start),
-        content = MessageContentFuzzer.fuzzTextMessage(),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
-      )
-    }
-
-    val firstBatchMediaMessages: List<TestMessage> = (0 until 10).map {
-      start += 200
-      TestMessage(
-        envelope = MessageContentFuzzer.envelope(start),
-        content = MessageContentFuzzer.fuzzMediaMessageWithBody(textMessages),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
-      )
-    }
-
-    val secondBatchNoContentMediaMessages: List<TestMessage> = (0 until 10).map {
-      start += 200
-      TestMessage(
-        envelope = MessageContentFuzzer.envelope(start),
-        content = MessageContentFuzzer.fuzzMediaMessageNoContent(textMessages + firstBatchMediaMessages),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
-      )
-    }
-
-    val thirdBatchNoTextMediaMessagesMessages: List<TestMessage> = (0 until 10).map {
-      start += 200
-      TestMessage(
-        envelope = MessageContentFuzzer.envelope(start),
-        content = MessageContentFuzzer.fuzzMediaMessageNoText(textMessages + firstBatchMediaMessages),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
-      )
-    }
-
-    testResult.runV2(textMessages + firstBatchMediaMessages + secondBatchNoContentMediaMessages + thirdBatchNoTextMediaMessagesMessages)
-    testResult.runV1(textMessages + firstBatchMediaMessages + secondBatchNoContentMediaMessages + thirdBatchNoTextMediaMessagesMessages)
-
-    testResult.assert()
-  }
-
-  private inner class TestResults {
-
-    private lateinit var v1Logs: List<Entry>
-    private lateinit var v1Messages: List<List<Pair<String, String?>>>
-    private lateinit var v1Attachments: List<List<Pair<String, String?>>>
-    private lateinit var v2Logs: List<Entry>
-    private lateinit var v2Messages: List<List<Pair<String, String?>>>
-    private lateinit var v2Attachments: List<List<Pair<String, String?>>>
-
-    fun runV1(messages: List<TestMessage>) {
-      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
-        if (content.hasDataMessage()) {
-          processorV1.process(
-            MessageContentProcessor.MessageState.DECRYPTED_OK,
-            toSignalServiceContent(envelope, content, metadata, serverDeliveredTimestamp),
-            null,
-            envelope.timestamp,
-            -1
-          )
-          ThreadUtil.sleep(1)
-        }
-      }
-
-      v1Logs = harness.inMemoryLogger.logs()
-      harness.inMemoryLogger.clear()
-
-      v1Messages = dumpMessages()
-      v1Attachments = dumpAttachments()
-    }
-
-    fun runV2(messages: List<TestMessage>) {
-      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
-        if (content.hasDataMessage()) {
-          processorV2.process(
-            envelope,
-            content,
-            metadata,
-            serverDeliveredTimestamp,
-            false
-          )
-          ThreadUtil.sleep(1)
-        }
-      }
-
-      v2Logs = harness.inMemoryLogger.logs()
-      harness.inMemoryLogger.clear()
-
-      v2Messages = dumpMessages()
-      v2Attachments = dumpAttachments()
-
-      cleanup()
-    }
-
-    fun cleanup() {
-      SignalDatabase.rawDatabase.withinTransaction { db ->
-        SignalDatabase.threads.deleteAllConversations()
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${MessageTable.TABLE_NAME}'")
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${ThreadTable.TABLE_NAME}'")
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${AttachmentTable.TABLE_NAME}'")
-      }
-    }
-
-    fun assert() {
-      v2Logs.zip(v1Logs)
-        .forEach { (v2, v1) ->
-          GENERALIZE_TAG[v2.tag]!!.assertIs(GENERALIZE_TAG[v1.tag]!!)
-
-          if (v2.tag != AttachmentTable.TAG) {
-            if (v2.message?.startsWith("[") == true && v1.message?.startsWith("[") == false) {
-              v2.message!!.substring(v2.message!!.indexOf(']') + 2).assertIs(v1.message)
-            } else {
-              v2.message.assertIs(v1.message)
-            }
-          } else {
-            if (v2.message?.startsWith("Inserted attachment at ID: AttachmentId::") == true) {
-              v2.message!!
-                .substring(0, v2.message!!.indexOf(','))
-                .assertIs(
-                  v1.message!!
-                    .substring(0, v1.message!!.indexOf(','))
-                )
-            } else {
-              v2.message.assertIs(v1.message)
-            }
-          }
-          v2.throwable.assertIs(v1.throwable)
-        }
-
-      v2Messages.zip(v1Messages)
-        .forEach { (v2, v1) ->
-          v2.assertIs(v1)
-        }
-
-      v2Attachments.zip(v1Attachments)
-        .forEach { (v2, v1) ->
-          v2.assertIs(v1)
-        }
-    }
-
-    private fun InMemoryLogger.logs(): List<Entry> {
-      return entries()
-        .filter { TAGS.contains(it.tag) }
-    }
-
-    private fun dumpMessages(): List<List<Pair<String, String?>>> {
-      return dumpTable(MessageTable.TABLE_NAME)
-        .map { row ->
-          val newRow = row.toMutableList()
-          newRow.removeIf { IGNORE_MESSAGE_COLUMNS.contains(it.first) }
-          newRow
-        }
-    }
-
-    private fun dumpAttachments(): List<List<Pair<String, String?>>> {
-      return dumpTable(AttachmentTable.TABLE_NAME)
-        .map { row ->
-          val newRow = row.toMutableList()
-          newRow.removeIf { IGNORE_ATTACHMENT_COLUMNS.contains(it.first) }
-          newRow
-        }
-    }
-
-    private fun dumpTable(table: String): List<List<Pair<String, String?>>> {
-      return SignalDatabase.rawDatabase
-        .select()
-        .from(table)
-        .run()
-        .readToList { cursor ->
-          val map: List<Pair<String, String?>> = cursor.columnNames.map { column ->
-            val index = cursor.getColumnIndex(column)
-            var data: String? = when (cursor.getType(index)) {
-              Cursor.FIELD_TYPE_BLOB -> Base64.encodeToString(cursor.getBlob(index), 0)
-              else -> cursor.getString(index)
-            }
-            if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
-              data = MessageTableTestUtils.typeColumnToString(cursor.getLong(index))
-            }
-
-            column to data
-          }
-          map
-        }
-    }
-  }
-
-  private fun toSignalServiceContent(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long): SignalServiceContent {
-    val localAddress = SignalServiceAddress(metadata.destinationServiceId, Optional.ofNullable(SignalStore.account().e164))
-    val signalServiceMetadata = SignalServiceMetadata(
-      SignalServiceAddress(metadata.sourceServiceId, Optional.ofNullable(metadata.sourceE164)),
-      metadata.sourceDeviceId,
-      envelope.timestamp,
-      envelope.serverTimestamp,
-      serverDeliveredTimestamp,
-      metadata.sealedSender,
-      envelope.serverGuid,
-      Optional.ofNullable(metadata.groupId),
-      metadata.destinationServiceId.toString()
-    )
-
-    val contentProto = SignalServiceContentProto.newBuilder()
-      .setLocalAddress(SignalServiceAddressProtobufSerializer.toProtobuf(localAddress))
-      .setMetadata(SignalServiceMetadataProtobufSerializer.toProtobuf(signalServiceMetadata))
-      .setContent(content)
-      .build()
-
-    return SignalServiceContent.createFromProto(contentProto)!!
-  }
-}

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

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

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

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

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

@@ -20,17 +20,17 @@ import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupC
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
-class MessageContentProcessorV2__recipientStatusTest {
+class MessageContentProcessor__recipientStatusTest {
 
   @get:Rule
   val harness = SignalActivityRule()
 
-  private lateinit var processorV2: MessageContentProcessorV2
+  private lateinit var processor: MessageContentProcessor
   private var envelopeTimestamp: Long = 0
 
   @Before
   fun setup() {
-    processorV2 = MessageContentProcessorV2(harness.context)
+    processor = MessageContentProcessor(harness.context)
     envelopeTimestamp = System.currentTimeMillis()
   }
 
@@ -49,7 +49,7 @@ class MessageContentProcessorV2__recipientStatusTest {
       timestamp = envelopeTimestamp
     }
 
-    processorV2.process(
+    processor.process(
       envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
       content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0])),
       metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId),
@@ -61,7 +61,7 @@ class MessageContentProcessorV2__recipientStatusTest {
     val firstMessageId = firstSyncMessages[0].id
     val firstReceiptInfo = SignalDatabase.groupReceipts.getGroupReceiptInfo(firstMessageId)
 
-    processorV2.process(
+    processor.process(
       envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
       content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0], harness.others[1]), recipientUpdate = true),
       metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId),

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

@@ -9,6 +9,7 @@ import okio.ByteString
 import okio.ByteString.Companion.toByteString
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -37,7 +38,7 @@ import android.util.Log as AndroidLog
 /**
  * Sends N messages from Bob to Alice to track performance of Alice's processing of messages.
  */
-// @Ignore("Ignore test in normal testing as it's a performance test with no assertions")
+@Ignore("Ignore test in normal testing as it's a performance test with no assertions")
 @RunWith(AndroidJUnit4::class)
 class MessageProcessingPerformanceTest {
 
@@ -58,14 +59,14 @@ class MessageProcessingPerformanceTest {
     mockkStatic(UnidentifiedAccessUtil::class)
     every { UnidentifiedAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
 
-    mockkObject(MessageContentProcessorV2)
-    every { MessageContentProcessorV2.create(harness.application) } returns TimingMessageContentProcessorV2(harness.application)
+    mockkObject(MessageContentProcessor)
+    every { MessageContentProcessor.create(harness.application) } returns TimingMessageContentProcessor(harness.application)
   }
 
   @After
   fun after() {
     unmockkStatic(UnidentifiedAccessUtil::class)
-    unmockkStatic(MessageContentProcessorV2::class)
+    unmockkStatic(MessageContentProcessor::class)
   }
 
   @Test
@@ -106,7 +107,7 @@ class MessageProcessingPerformanceTest {
     // Wait until they've all been fully decrypted + processed
     harness
       .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessorV2.endTagPredicate(lastTimestamp))
+      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(lastTimestamp))
       .awaitFor(1.minutes)
 
     harness.inMemoryLogger.flush()
@@ -125,7 +126,7 @@ class MessageProcessingPerformanceTest {
 
     // Calculate MessageContentProcessor
 
-    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessorV2.TAG }.drop(2)
+    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessor.TAG }.drop(2)
     val iterator = takeLast.iterator()
     var processCount = 0L
     var processDuration = 0L
@@ -141,7 +142,7 @@ class MessageProcessingPerformanceTest {
     // Calculate messages per second from "retrieving" first message post session initialization to processing last message
 
     val start = entries.first { it.message == "Retrieved envelope! $firstTimestamp" }
-    val end = entries.first { it.message == TimingMessageContentProcessorV2.endTag(lastTimestamp) }
+    val end = entries.first { it.message == TimingMessageContentProcessor.endTag(lastTimestamp) }
 
     val duration = (end.timestamp - start.timestamp).toFloat() / 1000f
     val messagePerSecond = messageCount.toFloat() / duration
@@ -156,7 +157,7 @@ class MessageProcessingPerformanceTest {
 
     val aliceProcessFirstMessageLatch = harness
       .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessorV2.endTagPredicate(firstPreKeyMessageTimestamp))
+      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(firstPreKeyMessageTimestamp))
 
     Thread { aliceClient.process(encryptedEnvelope, System.currentTimeMillis()) }.start()
     aliceProcessFirstMessageLatch.awaitFor(15.seconds)

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

@@ -3,12 +3,13 @@ package org.thoughtcrime.securesms.messages
 import android.content.Context
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testing.LogPredicate
+import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 
-class TimingMessageContentProcessorV2(context: Context) : MessageContentProcessorV2(context) {
+class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(context) {
   companion object {
-    val TAG = Log.tag(TimingMessageContentProcessorV2::class.java)
+    val TAG = Log.tag(TimingMessageContentProcessor::class.java)
 
     fun endTagPredicate(timestamp: Long): LogPredicate = { entry ->
       entry.tag == TAG && entry.message == endTag(timestamp)
@@ -18,9 +19,9 @@ class TimingMessageContentProcessorV2(context: Context) : MessageContentProcesso
     fun endTag(timestamp: Long) = "$timestamp end"
   }
 
-  override fun process(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean) {
+  override fun process(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
     Log.d(TAG, startTag(envelope.timestamp))
-    super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent)
+    super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
     Log.d(TAG, endTag(envelope.timestamp))
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt

@@ -14,8 +14,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
 import org.whispersystems.signalservice.api.storage.StorageId
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
@@ -39,14 +39,13 @@ class ContactRecordProcessorTest {
     setStorageId(originalId, STORAGE_ID_A)
 
     val remote1 = buildRecord(STORAGE_ID_B) {
-      setServiceId(ACI_A.toString())
+      setAci(ACI_A.toString())
       setUnregisteredAtTimestamp(100)
     }
 
     val remote2 = buildRecord(STORAGE_ID_C) {
-      setServiceId(PNI_A.toString())
-      setServicePni(PNI_A.toString())
-      setServiceE164(E164_A)
+      setPni(PNI_A.toString())
+      setE164(E164_A)
     }
 
     // WHEN
@@ -54,10 +53,10 @@ class ContactRecordProcessorTest {
     subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
 
     // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
 
     val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
 
     assertEquals(originalId, byAci)
     assertEquals(byE164, byPni)
@@ -71,14 +70,14 @@ class ContactRecordProcessorTest {
     setStorageId(originalId, STORAGE_ID_A)
 
     val remote1 = buildRecord(STORAGE_ID_B) {
-      setServiceId(ACI_A.toString())
+      setAci(ACI_A.toString())
       setUnregisteredAtTimestamp(0)
     }
 
     val remote2 = buildRecord(STORAGE_ID_C) {
-      setServiceId(PNI_A.toString())
-      setServicePni(PNI_A.toString())
-      setServiceE164(E164_A)
+      setAci(PNI_A.toString())
+      setPni(PNI_A.toString())
+      setE164(E164_A)
     }
 
     // WHEN
@@ -86,7 +85,7 @@ class ContactRecordProcessorTest {
     subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
 
     // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
     val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
     val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
 

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

@@ -27,7 +27,7 @@ class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECK
 
   private val aliceSenderCertificate = FakeClientHelpers.createCertificateFor(
     trustRoot = trustRoot,
-    uuid = serviceId.uuid(),
+    uuid = serviceId.rawUuid,
     e164 = e164,
     deviceId = 1,
     identityKey = SignalStore.account().aciIdentityKey.publicKey.publicKey,

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

@@ -32,10 +32,10 @@ import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos
-import java.lang.UnsupportedOperationException
 import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantLock
+import kotlin.UnsupportedOperationException
 
 /**
  * Welcome to Bob's Client.
@@ -50,7 +50,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
   private val serviceAddress = SignalServiceAddress(serviceId, e164)
   private val registrationId = KeyHelper.generateRegistrationId(false)
   private val aciStore = BobSignalServiceAccountDataStore(registrationId, identityKeyPair)
-  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.uuid(), e164, 1, identityKeyPair.publicKey.publicKey, 31337)
+  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.rawUuid, e164, 1, identityKeyPair.publicKey.publicKey, 31337)
   private val sessionLock = object : SignalSessionLock {
     private val lock = ReentrantLock()
 
@@ -144,7 +144,6 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun getSubDeviceSessions(name: String?): List<Int> = emptyList()
     override fun containsSession(address: SignalProtocolAddress?): Boolean = aliceSessionRecord != null
     override fun getIdentity(address: SignalProtocolAddress?): IdentityKey = SignalStore.account().aciIdentityKey.publicKey
-
     override fun loadPreKey(preKeyId: Int): PreKeyRecord = throw UnsupportedOperationException()
     override fun storePreKey(preKeyId: Int, record: PreKeyRecord?) = throw UnsupportedOperationException()
     override fun containsPreKey(preKeyId: Int): Boolean = throw UnsupportedOperationException()
@@ -162,6 +161,8 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun storeKyberPreKey(kyberPreKeyId: Int, record: KyberPreKeyRecord?) = throw UnsupportedOperationException()
     override fun containsKyberPreKey(kyberPreKeyId: Int): Boolean = throw UnsupportedOperationException()
     override fun markKyberPreKeyUsed(kyberPreKeyId: Int) = throw UnsupportedOperationException()
+    override fun deleteAllStaleOneTimeEcPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
+    override fun markAllOneTimeEcPreKeysStaleIfNecessary(staleTime: Long) = throw UnsupportedOperationException()
     override fun storeSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?, record: SenderKeyRecord?) = throw UnsupportedOperationException()
     override fun loadSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?): SenderKeyRecord = throw UnsupportedOperationException()
     override fun archiveSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
@@ -171,8 +172,9 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun clearSenderKeySharedWith(addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
     override fun storeLastResortKyberPreKey(kyberPreKeyId: Int, kyberPreKeyRecord: KyberPreKeyRecord) = throw UnsupportedOperationException()
     override fun removeKyberPreKey(kyberPreKeyId: Int) = throw UnsupportedOperationException()
+    override fun markAllOneTimeKyberPreKeysStaleIfNecessary(staleTime: Long) = throw UnsupportedOperationException()
+    override fun deleteAllStaleOneTimeKyberPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
     override fun loadLastResortKyberPreKeys(): List<KyberPreKeyRecord> = throw UnsupportedOperationException()
-
     override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
   }
 }

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

@@ -69,7 +69,7 @@ object FakeClientHelpers {
       .setSourceDevice(1)
       .setTimestamp(timestamp)
       .setServerTimestamp(timestamp + 1)
-      .setDestinationUuid(destination.toString())
+      .setDestinationServiceId(destination.toString())
       .setServerGuid(UUID.randomUUID().toString())
       .setContent(Base64.decode(this.content).toProtoByteString())
       .setUrgent(true)

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

@@ -8,16 +8,16 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import kotlin.random.Random
 
 /**
  * Helper methods for creating groups for message processing tests et al.
  */
 object GroupTestingUtils {
-  fun member(serviceId: ServiceId, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
+  fun member(aci: ACI, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
     return DecryptedMember.newBuilder()
-      .setUuid(serviceId.toByteString())
+      .setAciBytes(aci.toByteString())
       .setJoinedAtRevision(revision)
       .setRole(role)
       .build()
@@ -43,7 +43,7 @@ object GroupTestingUtils {
   }
 
   fun Recipient.asMember(): DecryptedMember {
-    return member(serviceId = requireServiceId())
+    return member(aci = requireAci())
   }
 
   data class TestGroupInfo(val groupId: GroupId.V2, val masterKey: GroupMasterKey, val recipientId: RecipientId)

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

@@ -105,7 +105,7 @@ object MessageContentFuzzer {
             addAllUnidentifiedStatus(
               deliveredTo.map {
                 SyncMessage.Sent.UnidentifiedDeliveryStatus.newBuilder().buildWith {
-                  destinationUuid = Recipient.resolved(it).requireServiceId().toString()
+                  destinationServiceId = Recipient.resolved(it).requireServiceId().toString()
                   unidentified = true
                 }
               }
@@ -135,7 +135,7 @@ object MessageContentFuzzer {
             val quoted = quoteAble.random(random)
             quote = DataMessage.Quote.newBuilder().buildWith {
               id = quoted.envelope.timestamp
-              authorUuid = quoted.metadata.sourceServiceId.toString()
+              authorAci = quoted.metadata.sourceServiceId.toString()
               text = quoted.content.dataMessage.body
               addAllAttachments(quoted.content.dataMessage.attachmentsList)
               addAllBodyRanges(quoted.content.dataMessage.bodyRangesList)
@@ -147,7 +147,7 @@ object MessageContentFuzzer {
             val quoted = quoteAble.random(random)
             quote = DataMessage.Quote.newBuilder().buildWith {
               id = random.nextLong(quoted.envelope.timestamp - 1000000, quoted.envelope.timestamp)
-              authorUuid = quoted.metadata.sourceServiceId.toString()
+              authorAci = quoted.metadata.sourceServiceId.toString()
               text = quoted.content.dataMessage.body
             }
           }
@@ -174,7 +174,7 @@ object MessageContentFuzzer {
             reaction = DataMessage.Reaction.newBuilder().buildWith {
               emoji = emojis.random(random)
               remove = false
-              targetAuthorUuid = reactTo.metadata.sourceServiceId.toString()
+              targetAuthorAci = reactTo.metadata.sourceServiceId.toString()
               targetSentTimestamp = reactTo.envelope.timestamp
             }
           }

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

@@ -1,9 +1,7 @@
 package org.thoughtcrime.securesms.testing
 
-import io.reactivex.rxjava3.core.Single
-import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
 import org.mockito.kotlin.stub
 import org.signal.core.util.Hex
 import org.signal.libsignal.protocol.IdentityKeyPair
@@ -15,17 +13,13 @@ import org.signal.libsignal.svr2.PinHash
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.pin.TokenData
 import org.thoughtcrime.securesms.test.BuildConfig
-import org.whispersystems.signalservice.api.KbsPinData
 import org.whispersystems.signalservice.api.KeyBackupService
+import org.whispersystems.signalservice.api.SvrPinData
 import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse
 import org.whispersystems.signalservice.internal.push.AuthCredentials
 import org.whispersystems.signalservice.internal.push.DeviceInfoList
 import org.whispersystems.signalservice.internal.push.PreKeyEntity
@@ -46,7 +40,8 @@ object MockProvider {
   val senderCertificate = SenderCertificate().apply { certificate = ByteArray(0) }
 
   val lockedFailure = PushServiceSocket.RegistrationLockFailure().apply {
-    backupCredentials = AuthCredentials.create("username", "password")
+    svr1Credentials = AuthCredentials.create("username", "password")
+    svr2Credentials = null
   }
 
   val primaryOnlyDeviceList = DeviceInfoList().apply {
@@ -83,26 +78,15 @@ object MockProvider {
     }
   }
 
-  fun mockGetRegistrationLockStringFlow(kbsRepository: KbsRepository) {
-    val tokenData: TokenData = mock {
-      on { enclave } doReturn BuildConfig.KBS_ENCLAVE
-      on { basicAuth } doReturn "basicAuth"
-      on { triesRemaining } doReturn 10
-      on { tokenResponse } doReturn TokenResponse()
-    }
-
-    kbsRepository.stub {
-      on { getToken(any() as? String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
-    }
-
+  fun mockGetRegistrationLockStringFlow() {
     val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {
       override fun hashSalt(): ByteArray = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8")
-      override fun restorePin(hashedPin: PinHash?): KbsPinData = KbsPinData(MasterKey.createNew(SecureRandom()), null)
+      override fun restorePin(hashedPin: PinHash?): SvrPinData = SvrPinData(MasterKey.createNew(SecureRandom()), null)
     }
 
     val kbsService = ApplicationDependencies.getKeyBackupService(BuildConfig.KBS_ENCLAVE)
     kbsService.stub {
-      on { newRegistrationSession(any(), any()) } doReturn session
+      on { newRegistrationSession(anyOrNull(), anyOrNull()) } doReturn session
     }
   }
 

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

@@ -22,6 +22,8 @@ class Put(path: String, responseFactory: ResponseFactory) : Verb(defaultRequestP
 
 class Post(path: String, responseFactory: ResponseFactory) : Verb(defaultRequestPredicate("POST", path), responseFactory)
 
+class Delete(path: String, responseFactory: ResponseFactory) : Verb(defaultRequestPredicate("DELETE", path), responseFactory)
+
 fun MockResponse.success(response: Any? = null): MockResponse {
   return setResponseCode(200).apply {
     if (response != null) {

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

@@ -29,10 +29,10 @@ import org.thoughtcrime.securesms.registration.RegistrationData
 import org.thoughtcrime.securesms.registration.RegistrationRepository
 import org.thoughtcrime.securesms.registration.RegistrationUtil
 import org.thoughtcrime.securesms.registration.VerifyResponse
+import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.ServiceIdType
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor
@@ -45,7 +45,7 @@ import java.util.UUID
  *
  * To use: `@get:Rule val harness = SignalActivityRule()`
  */
-class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() {
+class SignalActivityRule(private val othersCount: Int = 4, private val createGroup: Boolean = false) : ExternalResource() {
 
   val application: Application = ApplicationDependencies.getApplication()
 
@@ -57,6 +57,9 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     private set
   lateinit var othersKeys: List<IdentityKeyPair>
 
+  var group: GroupTestingUtils.TestGroupInfo? = null
+    private set
+
   val inMemoryLogger: InMemoryLogger
     get() = (application as SignalInstrumentationApplicationContext).inMemoryLogger
 
@@ -68,6 +71,15 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     others = setupOthers.first
     othersKeys = setupOthers.second
 
+    if (createGroup && others.size >= 2) {
+      group = GroupTestingUtils.insertGroup(
+        revision = 0,
+        self.asMember(),
+        others[0].asMember(),
+        others[1].asMember()
+      )
+    }
+
     InstrumentationApplicationDependencyProvider.clearHandlers()
   }
 
@@ -78,6 +90,9 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
     preferences.edit().putBoolean("passphrase_initialized", true).commit()
 
+    SignalStore.account().generateAciIdentityKeyIfNecessary()
+    SignalStore.account().generatePniIdentityKeyIfNecessary()
+
     val registrationRepository = RegistrationRepository(application)
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(Put("/v2/keys") { MockResponse().success() })
@@ -88,19 +103,23 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
         password = Util.getSecret(18),
         registrationId = registrationRepository.registrationId,
         profileKey = registrationRepository.getProfileKey("+15555550101"),
-        aciPreKeyCollection = RegistrationRepository.generatePreKeysForType(ServiceIdType.ACI),
-        pniPreKeyCollection = RegistrationRepository.generatePreKeysForType(ServiceIdType.PNI),
         fcmToken = null,
         pniRegistrationId = registrationRepository.pniRegistrationId,
         recoveryPassword = "asdfasdfasdfasdf"
       ),
-      VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null),
+      VerifyResponse(
+        verifyAccountResponse = VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false),
+        masterKey = null,
+        pin = null,
+        aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().aciPreKeys),
+        pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().pniPreKeys)
+      ),
       false
     ).blockingGet()
 
     ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
 
-    SignalStore.kbsValues().optOut()
+    SignalStore.svr().optOut()
     RegistrationUtil.maybeMarkRegistrationComplete()
     SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
 

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

@@ -4,8 +4,8 @@ import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID
 
 /**
@@ -34,7 +34,7 @@ class SignalDatabaseRule(
 
   private fun deleteAllThreads() {
     if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.messages.deleteAllThreads()
+      SignalDatabase.threads.clearForTests()
     }
   }
 }

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

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.testing
 
 import com.google.protobuf.ByteString
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
@@ -17,7 +17,7 @@ class TestProtos private constructor() {
     uuid: UUID = UUID.randomUUID()
   ): AddressProto.Builder {
     return AddressProto.newBuilder()
-      .setUuid(ServiceId.from(uuid).toByteString())
+      .setUuid(ACI.from(uuid).toByteString())
   }
 
   fun metadata(
@@ -41,7 +41,7 @@ class TestProtos private constructor() {
     authorUuid: String = UUID.randomUUID().toString()
   ): DataMessage.StoryContext.Builder {
     return DataMessage.StoryContext.newBuilder()
-      .setAuthorUuid(authorUuid)
+      .setAuthorAci(authorUuid)
       .setSentTimestamp(sentTimestamp)
   }
 

app/src/benchmark/java/org/signal/benchmark/BenchmarkSetupActivity.kt

@@ -6,8 +6,6 @@ import org.signal.benchmark.setup.TestMessages
 import org.signal.benchmark.setup.TestUsers
 import org.thoughtcrime.securesms.BaseActivity
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
-import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.recipients.Recipient
 
 class BenchmarkSetupActivity : BaseActivity() {
@@ -53,13 +51,6 @@ class BenchmarkSetupActivity : BaseActivity() {
         TestMessages.insertOutgoingTextMessage(other = recipient, body = "Test message $i", timestamp = generator.nextTimestamp())
       }
 
-      val voiceMessageId = TestMessages.insertIncomingVoiceMessage(other = recipient, timestamp = generator.nextTimestamp())
-      val mmsRecord = SignalDatabase.messages.getMessageRecord(voiceMessageId) as MediaMmsMessageRecord
-      TestMessages.insertOutgoingImageMessage(other = recipient, body = "test", 2, generator.nextTimestamp())
-      TestMessages.insertIncomingTextMessage(other = recipient, "reply to the test message", generator.nextTimestamp())
-      TestMessages.insertIncomingQuoteTextMessage(other = recipient, quote = QuoteModel(mmsRecord.timestamp, recipient.id, "Fake voice message text", false, mmsRecord.slideDeck.asAttachments(), null, QuoteModel.Type.NORMAL, null), body = "Here is a cool quote", timestamp = generator.nextTimestamp())
-      TestMessages.insertOutgoingTextMessage(other = recipient, body = "longaweorijoaijwerijoiajwer", timestamp = generator.nextTimestamp())
-
       SignalDatabase.threads.update(SignalDatabase.threads.getOrCreateThreadIdFor(recipient = recipient), true)
     }
   }

app/src/benchmark/java/org/signal/benchmark/DummyAccountManagerFactory.kt

@@ -7,8 +7,8 @@ import org.thoughtcrime.securesms.push.AccountManagerFactory
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.account.PreKeyUpload
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import java.io.IOException
 import java.util.Optional

app/src/benchmark/java/org/signal/benchmark/setup/TestMessages.kt

@@ -148,6 +148,7 @@ object TestMessages {
       1024,
       1024,
       Optional.empty(),
+      Optional.empty(),
       Optional.of("/not-there.jpg"),
       false,
       false,
@@ -169,6 +170,7 @@ object TestMessages {
       1024,
       1024,
       Optional.empty(),
+      Optional.empty(),
       Optional.of("/not-there.aac"),
       true,
       false,

app/src/benchmark/java/org/signal/benchmark/setup/TestUsers.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import org.signal.benchmark.DummyAccountManagerFactory
+import org.signal.core.util.concurrent.safeBlockingGet
 import org.signal.libsignal.protocol.SignalProtocolAddress
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil
@@ -22,13 +23,13 @@ import org.thoughtcrime.securesms.registration.RegistrationUtil
 import org.thoughtcrime.securesms.registration.VerifyResponse
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.ServiceIdType
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import java.util.UUID
+
 object TestUsers {
 
   private var generatedOthers: Int = 0
@@ -43,6 +44,9 @@ object TestUsers {
     val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
     preferences.edit().putBoolean("passphrase_initialized", true).commit()
 
+    SignalStore.account().generateAciIdentityKeyIfNecessary()
+    SignalStore.account().generatePniIdentityKeyIfNecessary()
+
     val registrationRepository = RegistrationRepository(application)
     val registrationData = RegistrationData(
       code = "123123",
@@ -50,22 +54,30 @@ object TestUsers {
       password = Util.getSecret(18),
       registrationId = registrationRepository.registrationId,
       profileKey = registrationRepository.getProfileKey("+15555550101"),
-      aciPreKeyCollection = RegistrationRepository.generatePreKeysForType(ServiceIdType.ACI),
-      pniPreKeyCollection = RegistrationRepository.generatePreKeysForType(ServiceIdType.PNI),
       fcmToken = "fcm-token",
       pniRegistrationId = registrationRepository.pniRegistrationId,
       recoveryPassword = "asdfasdfasdfasdf"
     )
-    val verifyResponse = VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null)
+
+    val verifyResponse = VerifyResponse(
+      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false),
+      masterKey = null,
+      pin = null,
+      aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().aciPreKeys),
+      pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().pniPreKeys)
+    )
+
     AccountManagerFactory.setInstance(DummyAccountManagerFactory())
+
     val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
       registrationData,
       verifyResponse,
       false
-    ).blockingGet()
+    ).safeBlockingGet()
+
     ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
 
-    SignalStore.kbsValues().optOut()
+    SignalStore.svr().optOut()
     RegistrationUtil.maybeMarkRegistrationComplete()
     SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
 

app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardFragment.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.springboard
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.navGraphViewModels
+import org.signal.core.ui.Rows
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeFragment
+
+/**
+ * Configuration fragment for the internal conversation test fragment.
+ */
+class InternalConversationSpringboardFragment : ComposeFragment() {
+
+  private val viewModel: InternalConversationSpringboardViewModel by navGraphViewModels(R.id.app_settings)
+
+  @Composable
+  override fun FragmentContent() {
+    Content(this::navigateBack, this::launchTestFragment, viewModel.hasWallpaper)
+  }
+
+  private fun navigateBack() {
+    findNavController().popBackStack()
+  }
+
+  private fun launchTestFragment() {
+    findNavController().navigate(
+      InternalConversationSpringboardFragmentDirections
+        .actionInternalConversationSpringboardFragmentToInternalConversationTestFragment()
+    )
+  }
+}
+
+@Preview
+@Composable
+private fun ContentPreview() {
+  val hasWallpaper = remember { mutableStateOf(false) }
+
+  SignalTheme(isDarkMode = true) {
+    Content(onBackPressed = {}, onLaunchTestFragment = {}, hasWallpaper = hasWallpaper)
+  }
+}
+
+@Composable
+private fun Content(
+  onBackPressed: () -> Unit,
+  onLaunchTestFragment: () -> Unit,
+  hasWallpaper: MutableState<Boolean>
+) {
+  Scaffolds.Settings(
+    title = "Conversation Test Springboard",
+    onNavigationClick = onBackPressed,
+    navigationIconPainter = rememberVectorPainter(ImageVector.vectorResource(id = R.drawable.symbol_arrow_left_24))
+  ) {
+    Column(modifier = Modifier.padding(it)) {
+      Rows.TextRow(
+        text = "Launch Conversation Test Fragment",
+        onClick = onLaunchTestFragment
+      )
+
+      Rows.ToggleRow(
+        checked = hasWallpaper.value,
+        text = "Enable Wallpaper",
+        onCheckChanged = { hasWallpaper.value = it }
+      )
+    }
+  }
+}

app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/springboard/InternalConversationSpringboardViewModel.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.springboard
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+
+class InternalConversationSpringboardViewModel : ViewModel() {
+  val hasWallpaper = mutableStateOf(false)
+}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.components.settings.app.internal.conversation
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.test
 
 import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationMessageFactory
 import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey
@@ -59,11 +59,19 @@ class ConversationElementGenerator {
     return MessageTypes.BASE_SENT_TYPE or MessageTypes.SECURE_MESSAGE_BIT
   }
 
+  private fun getSentFailedOutgoingType(): Long {
+    return MessageTypes.BASE_SENT_FAILED_TYPE or MessageTypes.SECURE_MESSAGE_BIT
+  }
+
+  private fun getPendingOutgoingType(): Long {
+    return MessageTypes.BASE_OUTBOX_TYPE or MessageTypes.SECURE_MESSAGE_BIT
+  }
+
   private fun generateMessage(key: ConversationElementKey): MappingModel<*> {
     val messageId = key.requireMessageId()
     val now = getNow()
 
-    val testMessageWordLength = random.nextInt(40) + 1
+    val testMessageWordLength = random.nextInt(3) + 1
     val testMessage = (0 until testMessageWordLength).map {
       wordBank.random()
     }.joinToString(" ")
@@ -82,7 +90,7 @@ class ConversationElementGenerator {
       1,
       testMessage,
       SlideDeck(),
-      if (isIncoming) getIncomingType() else getSentOutgoingType(),
+      if (isIncoming) getIncomingType() else getPendingOutgoingType(),
       emptySet(),
       emptySet(),
       0,

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.components.settings.app.internal.conversation
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.test
 
 import org.signal.paging.PagedDataSource
 import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.components.settings.app.internal.conversation
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.test
 
 import android.net.Uri
 import android.os.Bundle
@@ -12,6 +12,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
+import androidx.navigation.navGraphViewModels
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.util.concurrent.LifecycleDisposable
@@ -20,6 +21,7 @@ import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.recyclerview.SmoothScrollingLinearLayoutManager
+import org.thoughtcrime.securesms.components.settings.app.internal.conversation.springboard.InternalConversationSpringboardViewModel
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState
 import org.thoughtcrime.securesms.contactshare.Contact
 import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickListener
@@ -54,16 +56,22 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
   private val binding by ViewBinderDelegate(ConversationTestFragmentBinding::bind)
   private val viewModel: InternalConversationTestViewModel by viewModels()
   private val lifecycleDisposable = LifecycleDisposable()
+  private val springboardViewModel: InternalConversationSpringboardViewModel by navGraphViewModels(R.id.app_settings)
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val adapter = ConversationAdapterV2(
       lifecycleOwner = viewLifecycleOwner,
       glideRequests = GlideApp.with(this),
       clickListener = ClickListener(),
-      hasWallpaper = false,
-      colorizer = Colorizer()
+      hasWallpaper = springboardViewModel.hasWallpaper.value,
+      colorizer = Colorizer(),
+      startExpirationTimeout = {}
     )
 
+    if (springboardViewModel.hasWallpaper.value) {
+      binding.root.setBackgroundColor(0xFF32C7E2.toInt())
+    }
+
     var startTime = 0L
     var firstRender = true
     lifecycleDisposable.bindTo(viewLifecycleOwner)
@@ -83,10 +91,10 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       }
     }
 
-    binding.root.layoutManager = SmoothScrollingLinearLayoutManager(requireContext(), true)
-    binding.root.adapter = adapter
+    binding.recycler.layoutManager = SmoothScrollingLinearLayoutManager(requireContext(), true)
+    binding.recycler.adapter = adapter
 
-    RecyclerViewColorizer(binding.root).apply {
+    RecyclerViewColorizer(binding.recycler).apply {
       setChatColors(ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto))
     }
   }

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.components.settings.app.internal.conversation
+package org.thoughtcrime.securesms.components.settings.app.internal.conversation.test
 
 import androidx.lifecycle.ViewModel
 import org.signal.paging.PagedData

app/src/main/AndroidManifest.xml

@@ -134,18 +134,21 @@
               android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
               android:taskAffinity=".calling"
               android:resizeableActivity="true"
-              android:launchMode="singleTask"/>
+              android:launchMode="singleTask"
+              android:exported="false" />
 
     <activity android:name=".messagerequests.CalleeMustAcceptMessageRequestActivity"
               android:theme="@style/TextSecure.DarkNoActionBar"
               android:noHistory="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false" />
 
     <activity android:name=".InviteActivity"
               android:theme="@style/Signal.Light.NoActionBar.Invite"
               android:windowSoftInputMode="stateHidden"
               android:parentActivityName=".MainActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false">
         <meta-data
             android:name="android.support.PARENT_ACTIVITY"
             android:value=".MainActivity" />
@@ -154,7 +157,8 @@
     <activity android:name=".PromptMmsActivity"
               android:label="Configure MMS Settings"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".DeviceProvisioningActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -176,11 +180,13 @@
     </activity>
 
     <activity android:name=".preferences.MmsPreferencesActivity"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false" />
 
     <activity android:name=".sharing.interstitial.ShareInterstitialActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:windowSoftInputMode="adjustResize" />
+              android:windowSoftInputMode="adjustResize"
+              android:exported="false" />
 
     <activity android:name=".sharing.v2.ShareActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
@@ -617,26 +623,18 @@
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".MainActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.MainActivity" />
-    </activity>
-
-    <activity android:name=".conversation.ConversationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".MainActivity">
+              android:parentActivityName=".MainActivity"
+              android:exported="false">
         <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.thoughtcrime.securesms.MainActivity" />
     </activity>
 
     <activity android:name=".conversation.BubbleConversationActivity"
-              android:theme="@style/Signal.DayNight"
-              android:allowEmbedded="true"
-              android:resizeableActivity="true" />
+        android:theme="@style/Signal.DayNight"
+        android:allowEmbedded="true"
+        android:resizeableActivity="true"
+        android:exported="false"/>
 
     <activity android:name=".conversation.ConversationPopupActivity"
               android:windowSoftInputMode="stateVisible"
@@ -644,78 +642,93 @@
               android:taskAffinity=""
               android:excludeFromRecents="true"
               android:theme="@style/TextSecure.LightTheme.Popup"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="adjustResize"/>
+              android:windowSoftInputMode="adjustResize"
+              android:exported="false"/>
 
     <activity android:name=".migrations.ApplicationMigrationActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
-      <activity android:name=".PassphraseCreateActivity"
+    <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".NewConversationActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".calls.links.details.CallLinkDetailsActivity"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".calls.new.NewCallActivity"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysVisible"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".PushContactSelectionActivity"
-          android:label="@string/AndroidManifest__select_contacts"
-          android:windowSoftInputMode="stateHidden"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:label="@string/AndroidManifest__select_contacts"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".giph.ui.GiphyActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
-        <activity android:name=".mediasend.v2.MediaSelectionActivity"
-            android:theme="@style/TextSecure.DarkNoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:launchMode="singleTop"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+    <activity android:name=".mediasend.v2.MediaSelectionActivity"
+              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+              android:launchMode="singleTop"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:exported="false"/>
 
-        <activity android:name=".conversation.mutiselect.forward.MultiselectForwardActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+    <activity android:name=".conversation.mutiselect.forward.MultiselectForwardActivity"
+              android:theme="@style/Signal.DayNight.NoActionBar"
+              android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
-        <activity android:name=".mediasend.v2.stories.StoriesMultiselectForwardActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+    <activity android:name=".mediasend.v2.stories.StoriesMultiselectForwardActivity"
+              android:theme="@style/Signal.DayNight.NoActionBar"
+              android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".PassphraseChangeActivity"
               android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".verify.VerifyIdentityActivity"
               android:exported="false"
@@ -737,13 +750,15 @@
         android:name=".stories.my.MyStoriesActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:theme="@style/Signal.DayNight.NoActionBar"
-        android:windowSoftInputMode="stateAlwaysHidden" />
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
     <activity
         android:name=".stories.settings.StorySettingsActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:theme="@style/Signal.DayNight.NoActionBar"
-        android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+        android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+        android:exported="false"/>
 
     <activity
         android:name=".stories.viewer.StoryViewerActivity"
@@ -752,82 +767,99 @@
         android:theme="@style/TextSecure.DarkNoActionBar.StoryViewer"
         android:launchMode="singleTask"
         android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-        android:parentActivityName=".MainActivity">
+        android:parentActivityName=".MainActivity"
+        android:exported="false">
 
         <meta-data
             android:name="android.support.PARENT_ACTIVITY"
             android:value="org.thoughtcrime.securesms.MainActivity" />
     </activity>
 
-        <activity android:name=".components.settings.app.changenumber.ChangeNumberLockActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".components.settings.app.changenumber.ChangeNumberLockActivity"
+        android:theme="@style/Signal.DayNight.NoActionBar"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
-        <activity android:name=".components.settings.conversation.ConversationSettingsActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.ConversationSettings"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
+    <activity
+        android:name=".components.settings.conversation.ConversationSettingsActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
+        android:theme="@style/Signal.DayNight.ConversationSettings"
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
-        <activity android:name=".components.settings.conversation.CallInfoActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
+    <activity
+        android:name=".components.settings.conversation.CallInfoActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
+        android:theme="@style/Signal.DayNight.NoActionBar"
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
-        <activity android:name=".badges.gifts.flow.GiftFlowActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
+    <activity
+        android:name=".badges.gifts.flow.GiftFlowActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
+        android:theme="@style/Signal.DayNight.NoActionBar"
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
-        <activity android:name=".wallpaper.ChatWallpaperActivity"
-                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
+    <activity
+        android:name=".wallpaper.ChatWallpaperActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
-        <activity android:name=".wallpaper.ChatWallpaperPreviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
+    <activity
+        android:name=".wallpaper.ChatWallpaperPreviewActivity"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:windowSoftInputMode="stateAlwaysHidden"
+        android:exported="false"/>
 
-        <activity android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:launchMode="singleTask"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
+        android:theme="@style/TextSecure.LightRegistrationTheme"
+        android:launchMode="singleTask"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
-        <activity android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
+        android:noHistory="true"
+        android:excludeFromRecents="true"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
     <activity android:name=".registration.RegistrationNavigationActivity"
               android:launchMode="singleTask"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".revealable.ViewOnceMessageActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.FullScreenMedia"
               android:windowSoftInputMode="stateHidden"
               android:excludeFromRecents="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".stickers.StickerManagementActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
      <activity android:name=".DeviceActivity"
                android:screenOrientation="portrait"
                android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+               android:exported="false"/>
 
     <activity android:name=".logsubmit.SubmitDebugLogActivity"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".mediapreview.MediaPreviewV2Activity"
               android:label="@string/AndroidManifest__media_preview"
@@ -840,19 +872,21 @@
     <activity android:name=".AvatarPreviewActivity"
               android:label="@string/AndroidManifest__media_preview"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
-    <activity
-              android:name=".avatar.photo.PhotoEditorActivity"
+    <activity android:name=".avatar.photo.PhotoEditorActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:label="@string/AndroidManifest__media_preview"
               android:theme="@style/TextSecure.DarkNoActionBar"
-              android:windowSoftInputMode="stateHidden" />
+              android:windowSoftInputMode="stateHidden"
+              android:exported="false"/>
 
     <activity android:name=".mediaoverview.MediaOverviewActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".DummyActivity"
               android:theme="@android:style/Theme.NoDisplay"
@@ -863,7 +897,8 @@
               android:alwaysRetainTaskState="false"
               android:stateNotNeeded="true"
               android:clearTaskOnLaunch="true"
-              android:finishOnTaskLaunch="true" />
+              android:finishOnTaskLaunch="true"
+              android:exported="false"/>
 
     <activity android:name=".PlayServicesProblemActivity"
               android:exported="false"
@@ -906,136 +941,190 @@
 
     <activity android:name=".mediasend.AvatarSelectionActivity"
               android:theme="@style/TextSecure.DarkNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".blocked.BlockedUsersActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
               android:theme="@style/Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".profiles.edit.EditProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
+              android:windowSoftInputMode="stateVisible|adjustResize"
+              android:exported="false"/>
 
     <activity android:name=".profiles.username.AddAUsernameActivity"
               android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
+              android:windowSoftInputMode="stateVisible|adjustResize"
+              android:exported="false"/>
 
     <activity android:name=".profiles.manage.ManageProfileActivity"
               android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
+              android:windowSoftInputMode="stateVisible|adjustResize"
+              android:exported="false"/>
 
-    <activity android:name=".payments.preferences.PaymentsActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".payments.preferences.PaymentsActivity"
+        android:theme="@style/TextSecure.LightRegistrationTheme"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
-    <activity android:name=".lock.v2.CreateKbsPinActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="adjustResize"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".lock.v2.CreateSvrPinActivity"
+        android:theme="@style/TextSecure.LightRegistrationTheme"
+        android:windowSoftInputMode="adjustResize"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
-    <activity android:name=".lock.v2.KbsMigrationActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="adjustResize"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity
+        android:name=".lock.v2.SvrMigrationActivity"
+        android:theme="@style/TextSecure.LightRegistrationTheme"
+        android:windowSoftInputMode="adjustResize"
+        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+        android:exported="false"/>
 
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert" />
+              android:theme="@style/Theme.AppCompat.Dialog.Alert"
+              android:exported="false"/>
 
     <activity android:name=".contactshare.ContactShareEditActivity"
               android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".contactshare.ContactNameEditActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".contactshare.SharedContactDetailsActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".ShortcutLauncherActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="true"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity
-            android:name=".maps.PlacePickerActivity"
-            android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name=".maps.PlacePickerActivity"
+              android:label="@string/PlacePickerActivity_title"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".MainActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".pin.PinRestoreActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.addmembers.AddMembersActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".megaphone.ClientDeprecatedActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:launchMode="singleTask" />
+              android:launchMode="singleTask"
+              android:exported="false"/>
 
     <activity android:name=".megaphone.SmsExportMegaphoneActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:screenOrientation="portrait"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:launchMode="singleTask" />
+              android:launchMode="singleTask"
+              android:exported="false"/>
 
     <activity android:name=".ratelimit.RecaptchaProofActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:exported="false"/>
 
     <activity android:name=".wallpaper.crop.WallpaperImageSelectionActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/TextSecure.DarkNoActionBar" />
+              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:exported="false"/>
 
     <activity android:name=".wallpaper.crop.WallpaperCropActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:screenOrientation="portrait"
-              android:theme="@style/Theme.Signal.WallpaperCropper" />
+              android:theme="@style/Theme.Signal.WallpaperCropper"
+              android:exported="false"/>
 
     <activity android:name=".reactions.edit.EditReactionsActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".exporter.flow.SmsExportActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:screenOrientation="portrait"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
     <activity android:name=".components.settings.app.subscription.donate.DonateToSignalActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:exported="false"/>
 
-    <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
-    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
-    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
-    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$BackgroundService"/>
-    <service android:name=".service.webrtc.AndroidCallConnectionService"
+    <service
+        android:enabled="true"
+        android:name=".exporter.SignalSmsExportService"
+        android:foregroundServiceType="dataSync"
+        android:exported="false"/>
+
+    <service
+        android:enabled="true"
+        android:name=".service.webrtc.WebRtcCallService"
+        android:foregroundServiceType="camera|microphone"
+        android:exported="false"/>
+
+    <service
+        android:enabled="true"
+        android:exported="false"
+        android:name=".service.KeyCachingService" />
+
+    <service
+        android:enabled="true"
+        android:name=".messages.IncomingMessageObserver$ForegroundService"
+        android:exported="false"/>
+
+    <service
+        android:enabled="true"
+        android:name=".messages.IncomingMessageObserver$BackgroundService"
+        android:exported="false"/>
+
+    <service
+        android:name=".service.webrtc.AndroidCallConnectionService"
         android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
         android:exported="true">
         <intent-filter>
@@ -1043,9 +1132,13 @@
         </intent-filter>
     </service>
 
-    <service android:name=".components.voice.VoiceNotePlaybackService" android:exported="true">
+    <service
+        android:name=".components.voice.VoiceNotePlaybackService"
+        android:foregroundServiceType="mediaPlayback"
+        android:exported="true">
         <intent-filter>
             <action android:name="android.media.browse.MediaBrowserService" />
+            <action android:name="androidx.media3.session.MediaSessionService"/>
         </intent-filter>
     </service>
 
@@ -1083,11 +1176,17 @@
         <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
     </service>
 
-    <service android:name=".service.GenericForegroundService"/>
+    <service
+        android:name=".service.GenericForegroundService"
+        android:exported="false"/>
 
-    <service android:name=".gcm.FcmFetchBackgroundService" />
+    <service
+        android:name=".gcm.FcmFetchBackgroundService"
+        android:exported="false"/>
 
-    <service android:name=".gcm.FcmFetchForegroundService" />
+    <service
+        android:name=".gcm.FcmFetchForegroundService"
+        android:exported="false"/>
 
     <service android:name=".gcm.FcmReceiveService" android:exported="true">
         <intent-filter>
@@ -1144,19 +1243,33 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.ExpirationListener" />
+    <receiver
+        android:name=".service.ExpirationListener"
+        android:exported="false"/>
 
-    <receiver android:name=".service.ExpiringStoriesManager$ExpireStoriesAlarm" />
+    <receiver
+        android:name=".service.ExpiringStoriesManager$ExpireStoriesAlarm"
+        android:exported="false"/>
 
-    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
+    <receiver
+        android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm"
+        android:exported="false"/>
 
-    <receiver android:name=".service.ScheduledMessageManager$ScheduledMessagesAlarm" />
+    <receiver
+        android:name=".service.ScheduledMessageManager$ScheduledMessagesAlarm"
+        android:exported="false"/>
 
-    <receiver android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm" />
+    <receiver
+        android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm"
+        android:exported="false"/>
 
-    <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
+    <receiver
+        android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm"
+        android:exported="false"/>
 
-    <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />
+    <receiver
+        android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver"
+        android:exported="false"/>
 
     <provider android:name=".providers.AvatarProvider"
               android:authorities="${applicationId}.avatar"
@@ -1212,7 +1325,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver" android:exported="false">
+    <receiver android:name=".messageprocessingalarm.RoutineMessageFetchReceiver" android:exported="false">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED" />
             <action android:name="org.thoughtcrime.securesms.action.PROCESS_MESSAGES" />
@@ -1259,12 +1372,14 @@
         android:name=".gcm.FcmJobService"
         android:permission="android.permission.BIND_JOB_SERVICE"
         android:enabled="@bool/enable_job_service"
+        android:exported="false"
         tools:targetApi="26" />
 
     <service
         android:name=".jobmanager.JobSchedulerScheduler$SystemService"
         android:permission="android.permission.BIND_JOB_SERVICE"
         android:enabled="@bool/enable_job_service"
+        android:exported="false"
         tools:targetApi="26" />
 
     <service

app/src/main/java/androidx/recyclerview/widget/ConversationLayoutManager.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package androidx.recyclerview.widget
+
+import android.content.Context
+import org.signal.core.util.logging.Log
+
+/**
+ * Variation of a vertical, reversed [LinearLayoutManager] that makes specific assumptions in how it will
+ * be used by Conversation view to support easier scrolling to the initial start position.
+ *
+ * Primarily, it assumes that an initial scroll to position call will always happen and that the implementation
+ * of [LinearLayoutManager] remains unchanged with respect to how it assigns [mPendingScrollPosition] and
+ * [mPendingScrollPositionOffset] in [LinearLayoutManager.scrollToPositionWithOffset] and how it always clears
+ * the pending state variables in every call to [LinearLayoutManager.onLayoutCompleted].
+ *
+ * The assumptions are necessary to force the requested scroll position/layout to occur even if the request
+ * happens prior to the data source populating the recycler view/adapter.
+ */
+class ConversationLayoutManager(context: Context) : LinearLayoutManager(context, RecyclerView.VERTICAL, true) {
+
+  private var afterScroll: (() -> Unit)? = null
+
+  override fun supportsPredictiveItemAnimations(): Boolean {
+    return false
+  }
+
+  /**
+   * Scroll to the desired position and be notified when the layout manager has completed the request
+   * via [afterScroll] callback.
+   */
+  fun scrollToPositionWithOffset(position: Int, offset: Int, afterScroll: () -> Unit) {
+    this.afterScroll = afterScroll
+    super.scrollToPositionWithOffset(position, offset)
+  }
+
+  /**
+   * If a scroll to position request is made and a layout pass occurs prior to the list being populated with via the data source,
+   * the base implementation clears the request as if it was never made.
+   *
+   * This override will capture the pending scroll position and offset, determine if the scroll request was satisfied, and
+   * re-request the scroll to position to force another attempt if not satisfied.
+   *
+   * A pending scroll request will be re-requested if the pending scroll position is outside the bounds of the current known size of
+   * items in the list.
+   */
+  override fun onLayoutCompleted(state: RecyclerView.State?) {
+    val pendingScrollPosition = mPendingScrollPosition
+    val pendingScrollOffset = mPendingScrollPositionOffset
+
+    val reRequestPendingPosition = pendingScrollPosition >= (state?.mItemCount ?: 0)
+
+    // Base implementation always clears mPendingScrollPosition+mPendingScrollPositionOffset
+    super.onLayoutCompleted(state)
+
+    // Re-request scroll to position request if necessary thus forcing mPendingScrollPosition+mPendingScrollPositionOffset to be re-assigned
+    if (reRequestPendingPosition) {
+      Log.d(TAG, "Re-requesting pending scroll position: $pendingScrollPosition offset: $pendingScrollOffset")
+      if (pendingScrollOffset != INVALID_OFFSET) {
+        scrollToPositionWithOffset(pendingScrollPosition, pendingScrollOffset)
+      } else {
+        scrollToPosition(pendingScrollPosition)
+      }
+    } else {
+      afterScroll?.invoke()
+      afterScroll = null
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(ConversationLayoutManager::class.java)
+  }
+}

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

@@ -6,7 +6,6 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.insights.InsightsOptOut;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
@@ -30,7 +29,6 @@ public final class AppInitialization {
   public static void onFirstEverAppLaunch(@NonNull Context context) {
     Log.i(TAG, "onFirstEverAppLaunch()");
 
-    InsightsOptOut.userRequestedOptOut(context);
     TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
     TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());
@@ -71,7 +69,6 @@ public final class AppInitialization {
   public static void onRepairFirstEverAppLaunch(@NonNull Context context) {
     Log.w(TAG, "onRepairFirstEverAppLaunch()");
 
-    InsightsOptOut.userRequestedOptOut(context);
     TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
     TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());

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

@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -30,6 +29,7 @@ import com.google.android.gms.security.ProviderInstaller;
 import org.conscrypt.Conscrypt;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
+import org.signal.core.util.MemoryTracker;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
@@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
-import org.thoughtcrime.securesms.gcm.FcmJobService;
+import org.thoughtcrime.securesms.gcm.FcmFetchManager;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
@@ -59,8 +59,7 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
-import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
-import org.thoughtcrime.securesms.jobs.RefreshKbsCredentialsJob;
+import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
@@ -69,7 +68,7 @@ import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
+import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.SignalGlideComponents;
@@ -91,6 +90,8 @@ import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.PowerManagerCompat;
+import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -184,7 +185,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
                             .addNonBlocking(this::initializePeriodicTasks)
                             .addNonBlocking(this::initializeCircumvention)
-                            .addNonBlocking(this::initializePendingMessages)
                             .addNonBlocking(this::initializeCleanup)
                             .addNonBlocking(this::initializeGlideCodecs)
                             .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
@@ -198,7 +198,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
                             .addPostRender(this::initializeTrimThreadsByDateManager)
-                            .addPostRender(RefreshKbsCredentialsJob::enqueueIfNecessary)
+                            .addPostRender(RefreshSvrCredentialsJob::enqueueIfNecessary)
                             .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                             .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
                             .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
@@ -229,6 +229,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
     ApplicationDependencies.getDeadlockDetector().start();
     SubscriptionKeepAliveJob.enqueueAndTrackTimeIfNecessary();
+    FcmFetchManager.onForeground(this);
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();
@@ -237,6 +238,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
       KeyCachingService.onAppForegrounded(this);
       ApplicationDependencies.getShakeToReport().enable();
       checkBuildExpiration();
+      MemoryTracker.start();
 
       long lastForegroundTime = SignalStore.misc().getLastForegroundTime();
       long currentTime        = System.currentTimeMillis();
@@ -260,6 +262,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getFrameRateTracker().stop();
     ApplicationDependencies.getShakeToReport().disable();
     ApplicationDependencies.getDeadlockDetector().stop();
+    MemoryTracker.stop();
   }
 
   public PersistentLogger getPersistentLogger() {
@@ -401,7 +404,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     DirectoryRefreshListener.schedule(this);
     LocalBackupListener.schedule(this);
     RotateSenderCertificateListener.schedule(this);
-    MessageProcessReceiver.startOrUpdateAlarm(this);
+    RoutineMessageFetchReceiver.startOrUpdateAlarm(this);
 
     if (BuildConfig.PLAY_STORE_DISABLED) {
       UpdateApkRefreshListener.schedule(this);
@@ -444,18 +447,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void initializePendingMessages() {
-    if (TextSecurePreferences.getNeedsMessagePull(this)) {
-      Log.i(TAG, "Scheduling a message fetch.");
-      if (Build.VERSION.SDK_INT >= 26) {
-        FcmJobService.schedule(this);
-      } else {
-        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
-      }
-      TextSecurePreferences.setNeedsMessagePull(this, false);
-    }
-  }
-
   @WorkerThread
   private void initializeBlobProvider() {
     BlobProvider.getInstance().initialize(this);

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

@@ -254,13 +254,8 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
       for (SelectedContact contact : contacts) {
         RecipientId recipientId    = contact.getOrCreateRecipientId(context);
         Recipient   recipient      = Recipient.resolved(recipientId);
-        int         subscriptionId = recipient.getDefaultSubscriptionId().orElse(-1);
 
-        MessageSender.send(context, OutgoingMessage.sms(recipient, message, subscriptionId), -1L, MessageSender.SendType.SMS, null, null);
-
-        if (recipient.getContactUri() != null) {
-          SignalDatabase.recipients().setHasSentInvite(recipient.getId());
-        }
+        MessageSender.send(context, OutgoingMessage.sms(recipient, message), -1L, MessageSender.SendType.SMS, null, null);
       }
 
       return null;

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -13,11 +14,18 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import org.signal.core.util.concurrent.LifecycleDisposable;
+import org.thoughtcrime.securesms.components.DebugLogsPromptDialogFragment;
+import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
 import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSheetFragment;
-import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
+import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
+import org.thoughtcrime.securesms.notifications.SlowNotificationsViewModel;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -37,6 +45,9 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
   private VoiceNoteMediaController      mediaController;
   private ConversationListTabsViewModel conversationListTabsViewModel;
+  private SlowNotificationsViewModel    slowNotificationsViewModel;
+
+  private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
 
   private boolean onFirstRender = false;
 
@@ -71,6 +82,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
           }
         });
 
+    lifecycleDisposable.bindTo(this);
 
     mediaController = new VoiceNoteMediaController(this, true);
 
@@ -86,6 +98,28 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
     conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
     updateTabVisibility();
+
+    slowNotificationsViewModel = new ViewModelProvider(this).get(SlowNotificationsViewModel.class);
+
+    lifecycleDisposable.add(
+        slowNotificationsViewModel
+            .getSlowNotificationState()
+            .subscribe(this::presentSlowNotificationState)
+    );
+  }
+
+  @SuppressLint("NewApi")
+  private void presentSlowNotificationState(SlowNotificationsViewModel.State slowNotificationState) {
+    switch (slowNotificationState) {
+      case NONE:
+        break;
+      case PROMPT_BATTERY_SAVER_DIALOG:
+        PromptBatterySaverDialogFragment.show(getSupportFragmentManager());
+        break;
+      case PROMPT_DEBUGLOGS:
+        DebugLogsPromptDialogFragment.show(this, getSupportFragmentManager());
+        break;
+    }
   }
 
   @Override
@@ -115,7 +149,16 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     super.onResume();
     dynamicTheme.onResume(this);
     if (SignalStore.misc().isOldDeviceTransferLocked()) {
-      OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
+      new MaterialAlertDialogBuilder(this)
+          .setTitle(R.string.OldDeviceTransferLockedDialog__complete_registration_on_your_new_device)
+          .setMessage(R.string.OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device)
+          .setPositiveButton(R.string.OldDeviceTransferLockedDialog__done, (d, w) -> OldDeviceExitActivity.exit(this))
+          .setNegativeButton(R.string.OldDeviceTransferLockedDialog__cancel_and_activate_this_device, (d, w) -> {
+            SignalStore.misc().clearOldDeviceTransferLocked();
+            DeviceTransferBlockingInterceptor.getInstance().unblockNetwork();
+          })
+          .setCancelable(false)
+          .show();
     }
 
     if (SignalStore.misc().getShouldShowLinkedDevicesReminder()) {
@@ -124,6 +167,8 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     }
 
     updateTabVisibility();
+
+    slowNotificationsViewModel.checkSlowNotificationHeuristics();
   }
 
   @Override

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

@@ -7,20 +7,26 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
-import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
+import io.reactivex.rxjava3.disposables.Disposable;
+
 public class MainNavigator {
 
   public static final int REQUEST_CONFIG_CHANGES = 901;
 
-  private final MainActivity activity;
+  private final MainActivity        activity;
+  private final LifecycleDisposable lifecycleDisposable;
 
   public MainNavigator(@NonNull MainActivity activity) {
-    this.activity = activity;
+    this.activity            = activity;
+    this.lifecycleDisposable = new LifecycleDisposable();
+
+    lifecycleDisposable.bindTo(activity);
   }
 
   public static MainNavigator get(@NonNull Activity activity) {
@@ -33,7 +39,7 @@ public class MainNavigator {
 
   /**
    * @return True if the back pressed was handled in our own custom way, false if it should be given
-   *         to the system to do the default behavior.
+   * to the system to do the default behavior.
    */
   public boolean onBackPressed() {
     Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_container);
@@ -46,13 +52,16 @@ public class MainNavigator {
   }
 
   public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition) {
-    Intent intent = ConversationIntents.createBuilder(activity, recipientId, threadId)
-                                       .withDistributionType(distributionType)
-                                       .withStartingPosition(startingPosition)
-                                       .build();
+    Disposable disposable = ConversationIntents.createBuilder(activity, recipientId, threadId)
+                                               .map(builder -> builder.withDistributionType(distributionType)
+                                                                      .withStartingPosition(startingPosition)
+                                                                      .build())
+                                               .subscribe(intent -> {
+                                                 activity.startActivity(intent);
+                                                 activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
+                                               });
 
-    activity.startActivity(intent);
-    activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
+    lifecycleDisposable.add(disposable);
   }
 
   public void goToAppSettings() {
@@ -68,10 +77,6 @@ public class MainNavigator {
     activity.startActivity(intent);
   }
 
-  public void goToInsights() {
-    InsightsLauncher.showInsightsDashboard(activity.getSupportFragmentManager());
-  }
-
   private @NonNull FragmentManager getFragmentManager() {
     return activity.getSupportFragmentManager();
   }
@@ -79,7 +84,7 @@ public class MainNavigator {
   public interface BackHandler {
     /**
      * @return True if the back pressed was handled in our own custom way, false if it should be given
-     *         to the system to do the default behavior.
+     * to the system to do the default behavior.
      */
     boolean onBackPressed();
   }

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

@@ -36,6 +36,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.signal.core.util.DimensionUnit;
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.menu.ActionItem;
@@ -45,24 +46,25 @@ import org.thoughtcrime.securesms.contacts.management.ContactsManagementViewMode
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import io.reactivex.rxjava3.disposables.Disposable;
+
 /**
  * Activity container for starting a new conversation.
  *
@@ -121,7 +123,7 @@ public class NewConversationActivity extends ContactSelectionActivity
           if (!resolved.isRegistered() || !resolved.hasServiceId()) {
             Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.");
             try {
-              ContactDiscovery.refresh(this, resolved, false);
+              ContactDiscovery.refresh(this, resolved, false, TimeUnit.SECONDS.toMillis(10));
               resolved = Recipient.resolved(resolved.getId());
             } catch (IOException e) {
               Log.w(TAG, "[onContactSelected] Failed to refresh directory for new contact.");
@@ -162,15 +164,18 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void launch(Recipient recipient) {
-    long   existingThread = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
-    Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
-                                               .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
-                                               .withDataUri(getIntent().getData())
-                                               .withDataType(getIntent().getType())
-                                               .build();
+    Disposable disposable = ConversationIntents.createBuilder(this, recipient.getId(), -1L)
+                                               .map(builder -> builder
+                                                   .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
+                                                   .withDataUri(getIntent().getData())
+                                                   .withDataType(getIntent().getType())
+                                                   .build())
+                                               .subscribe(intent -> {
+                                                 startActivity(intent);
+                                                 finish();
+                                               });
 
-    startActivity(intent);
-    finish();
+    disposables.add(disposable);
   }
 
   @Override
@@ -232,8 +237,8 @@ public class NewConversationActivity extends ContactSelectionActivity
 
   @Override
   public boolean onLongClick(View anchorView, ContactSearchKey contactSearchKey, RecyclerView recyclerView) {
-    RecipientId recipientId = contactSearchKey.requireRecipientSearchKey().getRecipientId();
-    List<ActionItem> actions = generateContextualActionsForRecipient(recipientId);
+    RecipientId      recipientId = contactSearchKey.requireRecipientSearchKey().getRecipientId();
+    List<ActionItem> actions     = generateContextualActionsForRecipient(recipientId);
     if (actions.isEmpty()) {
       return false;
     }
@@ -268,7 +273,12 @@ public class NewConversationActivity extends ContactSelectionActivity
         R.drawable.ic_chat_message_24,
         getString(R.string.NewConversationActivity__message),
         R.color.signal_colorOnSurface,
-        () -> startActivity(ConversationIntents.createBuilder(this, recipient.getId(), -1L).build())
+        () -> {
+          Disposable disposable = ConversationIntents.createBuilder(this, recipient.getId(), -1L)
+                                                     .subscribe(builder -> startActivity(builder.build()));
+
+          disposables.add(disposable);
+        }
     );
   }
 
@@ -361,6 +371,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .setPositiveButton(R.string.NewConversationActivity__remove,
                            (dialog, which) -> {
                              disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
+                               onRefresh();
                                displaySnackbar(R.string.NewConversationActivity__s_has_been_removed, recipient.getDisplayName(this));
                              }));
                            }
@@ -369,7 +380,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .show();
   }
 
-  private void displaySnackbar(@StringRes int message, Object ... formatArgs) {
+  private void displaySnackbar(@StringRes int message, Object... formatArgs) {
     Snackbar.make(findViewById(android.R.id.content), getString(message, formatArgs), Snackbar.LENGTH_SHORT).show();
   }
 }

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

@@ -19,9 +19,8 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
-import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
+import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.pin.PinRestoreActivity;
@@ -80,15 +79,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   protected void onPreCreate() {}
   protected void onCreate(Bundle savedInstanceState, boolean ready) {}
 
-  @Override
-  protected void onResume() {
-    super.onResume();
-
-    if (networkAccess.isCensored()) {
-      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
-    }
-  }
-
   @Override
   protected void onDestroy() {
     super.onDestroy();
@@ -189,11 +179,11 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private boolean userMustCreateSignalPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed() && !SignalStore.kbsValues().hasOptedOut();
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().lastPinCreateFailed() && !SignalStore.svr().hasOptedOut();
   }
 
   private boolean userHasSkippedOrForgottenPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().hasOptedOut() && SignalStore.kbsValues().isPinForgottenOrSkipped();
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut() && SignalStore.svr().isPinForgottenOrSkipped();
   }
 
   private boolean userMustSetProfileName() {
@@ -234,7 +224,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       intent = getIntent();
     }
 
-    return getRoutedIntent(CreateKbsPinActivity.class, intent);
+    return getRoutedIntent(CreateSvrPinActivity.class, intent);
   }
 
   private Intent getCreateProfileNameIntent() {

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

@@ -48,9 +48,9 @@ public class SmsSendtoActivity extends Activity {
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
-      long      threadId  = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
+      long      threadId  = SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
 
-      nextIntent = ConversationIntents.createBuilder(this, recipient.getId(), threadId)
+      nextIntent = ConversationIntents.createBuilderSync(this, recipient.getId(), threadId)
                                       .withDraftText(destination.getBody())
                                       .build();
     }

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

@@ -37,6 +37,7 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Consumer;
+import androidx.lifecycle.LiveDataReactiveStreams;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
 import androidx.window.layout.DisplayFeature;
@@ -50,6 +51,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
@@ -61,6 +63,10 @@ import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
 import org.thoughtcrime.securesms.components.webrtc.CallStateUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallToastPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
+import org.thoughtcrime.securesms.components.webrtc.InCallStatus;
+import org.thoughtcrime.securesms.components.webrtc.PendingParticipantsBottomSheet;
+import org.thoughtcrime.securesms.components.webrtc.PendingParticipantsView;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioDevice;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
@@ -76,8 +82,10 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
+import org.thoughtcrime.securesms.service.webrtc.CallLinkDisconnectReason;
 import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
 import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
@@ -93,8 +101,10 @@ import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
 import io.reactivex.rxjava3.disposables.Disposable;
 
 import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;
@@ -109,7 +119,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   /**
    * ANSWER the call via voice-only.
    */
-  public static final String ANSWER_ACTION       = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
+  public static final String ANSWER_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
 
   /**
    * ANSWER the call via video.
@@ -120,6 +130,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
   public static final String EXTRA_STARTED_FROM_FULLSCREEN   = WebRtcCallActivity.class.getCanonicalName() + ".STARTED_FROM_FULLSCREEN";
+  public static final String EXTRA_STARTED_FROM_CALL_LINK    = WebRtcCallActivity.class.getCanonicalName() + ".STARTED_FROM_CALL_LINK";
 
   private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
   private CallStateUpdatePopupWindow            callStateUpdatePopupWindow;
@@ -136,6 +147,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private WindowInfoTrackerCallbackAdapter windowInfoTrackerCallbackAdapter;
   private ThrottledDebouncer               requestNewSizesThrottle;
   private PictureInPictureParams.Builder   pipBuilderParams;
+  private LifecycleDisposable              lifecycleDisposable;
+  private long                             lastCallLinkDisconnectDialogShowTime;
 
   private Disposable ephemeralStateDisposable = Disposable.empty();
 
@@ -149,6 +162,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   @Override
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate(" + getIntent().getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false) + ")");
+
+    lifecycleDisposable = new LifecycleDisposable();
+    lifecycleDisposable.bindTo(this);
+
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     super.onCreate(savedInstanceState);
@@ -188,6 +205,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     windowInfoTrackerCallbackAdapter.addWindowLayoutInfoListener(this, SignalExecutors.BOUNDED, windowLayoutInfoConsumer);
 
     requestNewSizesThrottle = new ThrottledDebouncer(TimeUnit.SECONDS.toMillis(1));
+
+    initializePendingParticipantFragmentListener();
   }
 
   @Override
@@ -239,7 +258,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     super.onPause();
 
     if (!viewModel.isCallStarting()) {
-      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
         finish();
       }
@@ -259,7 +278,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
 
     if (!viewModel.isCallStarting()) {
-      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
         ApplicationDependencies.getSignalCallManager().cancelPreJoin();
       }
@@ -334,6 +353,54 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
   }
 
+  private void initializePendingParticipantFragmentListener() {
+    if (!FeatureFlags.adHocCalling()) {
+      return;
+    }
+
+    getSupportFragmentManager().setFragmentResultListener(
+        PendingParticipantsBottomSheet.REQUEST_KEY,
+        this,
+        (requestKey, result) -> {
+          PendingParticipantsBottomSheet.Action action = PendingParticipantsBottomSheet.getAction(result);
+          List<RecipientId> recipientIds = viewModel.getPendingParticipantsSnapshot()
+                                                    .getUnresolvedPendingParticipants()
+                                                    .stream()
+                                                    .map(r -> r.getRecipient().getId())
+                                                    .collect(Collectors.toList());
+
+          switch (action) {
+            case NONE:
+              break;
+            case APPROVE_ALL:
+              new MaterialAlertDialogBuilder(this)
+                  .setTitle(getResources().getQuantityString(R.plurals.WebRtcCallActivity__approve_d_requests, recipientIds.size(), recipientIds.size()))
+                  .setMessage(getResources().getQuantityString(R.plurals.WebRtcCallActivity__d_people_will_be_added_to_the_call, recipientIds.size(), recipientIds.size()))
+                  .setNegativeButton(android.R.string.cancel, null)
+                  .setPositiveButton(R.string.WebRtcCallActivity__approve_all, (dialog, which) -> {
+                    for (RecipientId id : recipientIds) {
+                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(id);
+                    }
+                  })
+                  .show();
+              break;
+            case DENY_ALL:
+              new MaterialAlertDialogBuilder(this)
+                  .setTitle(getResources().getQuantityString(R.plurals.WebRtcCallActivity__deny_d_requests, recipientIds.size(), recipientIds.size()))
+                  .setMessage(getResources().getQuantityString(R.plurals.WebRtcCallActivity__d_people_will_be_added_to_the_call, recipientIds.size(), recipientIds.size()))
+                  .setNegativeButton(android.R.string.cancel, null)
+                  .setPositiveButton(R.string.WebRtcCallActivity__deny_all, (dialog, which) -> {
+                    for (RecipientId id : recipientIds) {
+                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(id);
+                    }
+                  })
+                  .show();
+              break;
+          }
+        }
+    );
+  }
+
   private void initializeScreenshotSecurity() {
     if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
       getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
@@ -363,21 +430,23 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
     viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
     viewModel.getEvents().observe(this, this::handleViewModelEvent);
-    viewModel.getCallTime().observe(this, this::handleCallTime);
 
-    LiveDataUtil.combineLatest(viewModel.getCallParticipantsState(),
+    lifecycleDisposable.add(viewModel.getInCallstatus().subscribe(this::handleInCallStatus));
+
+    boolean isStartedFromCallLink = getIntent().getBooleanExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_CALL_LINK, false);
+    LiveDataUtil.combineLatest(LiveDataReactiveStreams.fromPublisher(viewModel.getCallParticipantsState().toFlowable(BackpressureStrategy.LATEST)),
                                viewModel.getOrientationAndLandscapeEnabled(),
                                viewModel.getEphemeralState(),
-                               (s, o, e) -> new CallParticipantsViewState(s, e, o.first == PORTRAIT_BOTTOM_EDGE, o.second))
+                               (s, o, e) -> new CallParticipantsViewState(s, e, o.first == PORTRAIT_BOTTOM_EDGE, o.second, isStartedFromCallLink))
                 .observe(this, p -> callScreen.updateCallParticipants(p));
     viewModel.getCallParticipantListUpdate().observe(this, participantUpdateWindow::addCallParticipantListUpdate);
     viewModel.getSafetyNumberChangeEvent().observe(this, this::handleSafetyNumberChangeEvent);
     viewModel.getGroupMembersChanged().observe(this, unused -> updateGroupMembersForGroupCall());
     viewModel.getGroupMemberCount().observe(this, this::handleGroupMemberCountChange);
-    viewModel.shouldShowSpeakerHint().observe(this, this::updateSpeakerHint);
+    lifecycleDisposable.add(viewModel.shouldShowSpeakerHint().subscribe(this::updateSpeakerHint));
 
     callScreen.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
-      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null) {
         if (state.needsNewRequestSizes()) {
           requestNewSizesThrottle.publish(() -> ApplicationDependencies.getSignalCallManager().updateRenderedResolutions());
@@ -397,6 +466,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       }
       viewModel.setIsLandscapeEnabled(info.isInPictureInPictureMode());
     });
+
+    callScreen.setPendingParticipantsViewListener(new PendingParticipantsViewListener());
+    Disposable disposable = viewModel.getPendingParticipants()
+                                     .subscribe(callScreen::updatePendingParticipantsList);
+
+    lifecycleDisposable.add(disposable);
   }
 
   private void initializePictureInPictureParams() {
@@ -458,14 +533,35 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
   }
 
-  private void handleCallTime(long callTime) {
-    EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(callTime);
+  private void handleInCallStatus(@NonNull InCallStatus inCallStatus) {
+    if (inCallStatus instanceof InCallStatus.ElapsedTime) {
 
-    if (ellapsedTimeFormatter == null) {
-      return;
+      EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(((InCallStatus.ElapsedTime) inCallStatus).getElapsedTime());
+
+      if (ellapsedTimeFormatter == null) {
+        return;
+      }
+
+      callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
+    } else if (inCallStatus instanceof InCallStatus.PendingCallLinkUsers) {
+      int waiting = ((InCallStatus.PendingCallLinkUsers) inCallStatus).getPendingUserCount();
+
+      callScreen.setStatus(getResources().getQuantityString(
+          R.plurals.WebRtcCallActivity__d_people_waiting,
+          waiting,
+          waiting
+      ));
+    } else if (inCallStatus instanceof InCallStatus.JoinedCallLinkUsers) {
+      int joined = ((InCallStatus.JoinedCallLinkUsers) inCallStatus).getJoinedUserCount();
+
+      callScreen.setStatus(getResources().getQuantityString(
+          R.plurals.WebRtcCallActivity__d_people,
+          joined,
+          joined
+      ));
+    }else {
+      throw new AssertionError();
     }
-
-    callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
   }
 
   private void handleSetAudioHandset() {
@@ -672,7 +768,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   @Override
   public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> changedRecipients) {
-    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
 
     if (state == null) {
       return;
@@ -686,11 +782,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   @Override
-  public void onMessageResentAfterSafetyNumberChange() { }
+  public void onMessageResentAfterSafetyNumberChange() {}
 
   @Override
   public void onCanceled() {
-    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
     if (state != null && state.getGroupCallState().isNotIdle()) {
       if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
         ApplicationDependencies.getSignalCallManager().cancelPreJoin();
@@ -758,6 +854,18 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         handleUntrustedIdentity(event); break;
     }
 
+    if (event.getCallLinkDisconnectReason() != null && event.getCallLinkDisconnectReason().getPostedAt() > lastCallLinkDisconnectDialogShowTime) {
+      lastCallLinkDisconnectDialogShowTime = System.currentTimeMillis();
+
+      if (event.getCallLinkDisconnectReason() instanceof CallLinkDisconnectReason.RemovedFromCall) {
+        displayRemovedFromCallLinkDialog();
+      } else if (event.getCallLinkDisconnectReason() instanceof CallLinkDisconnectReason.DeniedRequestToJoinCall) {
+        displayDeniedRequestToJoinCallLinkDialog();
+      } else {
+        throw new AssertionError("Unexpected reason: " + event.getCallLinkDisconnectReason());
+      }
+    }
+
     boolean enableVideo = event.getLocalParticipant().getCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
 
     viewModel.updateFromWebRtcViewModel(event, enableVideo);
@@ -779,6 +887,22 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
   }
 
+  private void displayRemovedFromCallLinkDialog() {
+    new MaterialAlertDialogBuilder(this)
+        .setTitle(R.string.WebRtcCallActivity__removed_from_call)
+        .setMessage(R.string.WebRtcCallActivity__someone_has_removed_you_from_the_call)
+        .setPositiveButton(android.R.string.ok, null)
+        .show();
+  }
+
+  private void displayDeniedRequestToJoinCallLinkDialog() {
+    new MaterialAlertDialogBuilder(this)
+        .setTitle(R.string.WebRtcCallActivity__join_request_denied)
+        .setMessage(R.string.WebRtcCallActivity__your_request_to_join_this_call_has_been_denied)
+        .setPositiveButton(android.R.string.ok, null)
+        .show();
+  }
+
   private void handleCallPreJoin(@NonNull WebRtcViewModel event) {
     if (event.getGroupState().isNotIdle()) {
       callScreen.setStatusFromGroupCallState(event.getGroupState());
@@ -833,6 +957,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     @Override
     public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
+      maybeDisplaySpeakerphonePopup(audioOutput);
       switch (audioOutput) {
         case HANDSET:
           handleSetAudioHandset();
@@ -853,8 +978,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     @RequiresApi(31)
     @Override
-    public void onAudioOutputChanged31(@NonNull Integer audioDeviceInfo) {
-      ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(audioDeviceInfo));
+    public void onAudioOutputChanged31(@NonNull WebRtcAudioDevice audioOutput) {
+      maybeDisplaySpeakerphonePopup(audioOutput.getWebRtcAudioOutput());
+      ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(audioOutput.getDeviceId()));
     }
 
     @Override
@@ -937,6 +1063,33 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
   }
 
+  private void maybeDisplaySpeakerphonePopup(WebRtcAudioOutput nextOutput) {
+    final WebRtcAudioOutput currentOutput = viewModel.getCurrentAudioOutput();
+    if (currentOutput == WebRtcAudioOutput.SPEAKER && nextOutput != WebRtcAudioOutput.SPEAKER) {
+      callStateUpdatePopupWindow.onCallStateUpdate(CallStateUpdatePopupWindow.CallStateUpdate.SPEAKER_OFF);
+    } else if (currentOutput != WebRtcAudioOutput.SPEAKER && nextOutput == WebRtcAudioOutput.SPEAKER) {
+      callStateUpdatePopupWindow.onCallStateUpdate(CallStateUpdatePopupWindow.CallStateUpdate.SPEAKER_ON);
+    }
+  }
+
+  private class PendingParticipantsViewListener implements PendingParticipantsView.Listener {
+
+    @Override
+    public void onAllowPendingRecipient(@NonNull Recipient pendingRecipient) {
+      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(pendingRecipient.getId());
+    }
+
+    @Override
+    public void onRejectPendingRecipient(@NonNull Recipient pendingRecipient) {
+      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(pendingRecipient.getId());
+    }
+
+    @Override
+    public void onLaunchPendingRequestsSheet() {
+      new PendingParticipantsBottomSheet().show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+    }
+  }
+
   private class WindowLayoutInfoConsumer implements Consumer<WindowLayoutInfo> {
 
     @Override

app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt

@@ -5,7 +5,7 @@ import android.app.backup.BackupDataInput
 import android.app.backup.BackupDataOutput
 import android.os.ParcelFileDescriptor
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.absbackup.backupables.KbsAuthTokens
+import org.thoughtcrime.securesms.absbackup.backupables.SvrAuthTokens
 import java.io.DataInputStream
 import java.io.DataOutputStream
 import java.io.FileInputStream
@@ -17,7 +17,7 @@ import java.io.IOException
  */
 class SignalBackupAgent : BackupAgent() {
   private val items: List<AndroidBackupItem> = listOf(
-    KbsAuthTokens
+    SvrAuthTokens
   )
 
   override fun onBackup(oldState: ParcelFileDescriptor?, data: BackupDataOutput, newState: ParcelFileDescriptor) {

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

@@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.absbackup.backupables
 import com.google.protobuf.InvalidProtocolBufferException
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.absbackup.AndroidBackupItem
-import org.thoughtcrime.securesms.absbackup.protos.KbsAuthToken
+import org.thoughtcrime.securesms.absbackup.protos.SvrAuthToken
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 /**
  * This backs up the not-secret KBS Auth tokens, which can be combined with a PIN to prove ownership of a phone number in order to complete the registration process.
  */
-object KbsAuthTokens : AndroidBackupItem {
+object SvrAuthTokens : AndroidBackupItem {
   private const val TAG = "KbsAuthTokens"
 
   override fun getKey(): String {
@@ -17,19 +17,19 @@ object KbsAuthTokens : AndroidBackupItem {
   }
 
   override fun getDataForBackup(): ByteArray {
-    val proto = KbsAuthToken(tokens = SignalStore.kbsValues().kbsAuthTokenList)
+    val proto = SvrAuthToken(tokens = SignalStore.svr().authTokenList)
     return proto.encode()
   }
 
   override fun restoreData(data: ByteArray) {
-    if (SignalStore.kbsValues().kbsAuthTokenList.isNotEmpty()) {
+    if (SignalStore.svr().authTokenList.isNotEmpty()) {
       return
     }
 
     try {
-      val proto = KbsAuthToken.ADAPTER.decode(data)
+      val proto = SvrAuthToken.ADAPTER.decode(data)
 
-      SignalStore.kbsValues().putAuthTokenList(proto.tokens)
+      SignalStore.svr().putAuthTokenList(proto.tokens)
     } catch (e: InvalidProtocolBufferException) {
       Log.w(TAG, "Cannot restore KbsAuthToken from backup service.")
     }

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

@@ -113,7 +113,7 @@ public class PointerAttachment extends Attachment {
                                              pointer.get().asPointer().getRemoteId().toString(),
                                              encodedKey, null,
                                              pointer.get().asPointer().getDigest().orElse(null),
-                                             pointer.get().asPointer().getincrementalDigest().orElse(null),
+                                             pointer.get().asPointer().getIncrementalDigest().orElse(null),
                                              fastPreflightId,
                                              pointer.get().asPointer().getVoiceNote(),
                                              pointer.get().asPointer().isBorderless(),
@@ -139,7 +139,7 @@ public class PointerAttachment extends Attachment {
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orElse(null) : null,
-                                             thumbnail != null ? thumbnail.asPointer().getincrementalDigest().orElse(null) : null,
+                                             thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().orElse(null) : null,
                                              null,
                                              false,
                                              false,
@@ -169,7 +169,7 @@ public class PointerAttachment extends Attachment {
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orElse(null) : null,
-                                             thumbnail != null ? thumbnail.asPointer().getincrementalDigest().orElse(null) : null,
+                                             thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().orElse(null) : null,
                                              null,
                                              false,
                                              false,

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

@@ -64,11 +64,21 @@ public class AudioRecorder {
   }
 
   public @NonNull Single<VoiceNoteDraft> startRecording() {
-    Log.i(TAG, "startRecording()");
+    return startRecording(Build.VERSION.SDK_INT >= 26);
+  }
+
+  public @NonNull Single<VoiceNoteDraft> startRecording(final boolean useMediaCodecWrapper) {
+    Log.i(TAG, "startRecording(" + useMediaCodecWrapper + ")");
 
     final SingleSubject<VoiceNoteDraft> recordingSingle = SingleSubject.create();
+    startRecordingInternal(useMediaCodecWrapper, recordingSingle);
+
+    return recordingSingle;
+  }
+
+  private void startRecordingInternal(boolean useMediaRecorderWrapper, SingleSubject<VoiceNoteDraft> recordingSingle) {
     executor.execute(() -> {
-      Log.i(TAG, "Running startRecording() + " + Thread.currentThread().getId());
+      Log.i(TAG, "Running startRecording(" + useMediaRecorderWrapper + ") + " + Thread.currentThread().getId());
       try {
         if (recorder != null) {
           recordingSingle.onError(new IllegalStateException("We can only do one recording at a time!"));
@@ -82,7 +92,7 @@ public class AudioRecorder {
                                        .withMimeType(MediaUtil.AUDIO_AAC)
                                        .createForDraftAttachmentAsync(context);
 
-        recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
+        recorder = useMediaRecorderWrapper ? new MediaRecorderWrapper() : new AudioCodec();
         int focusResult = audioFocusManager.requestAudioFocus();
         if (focusResult != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
           Log.w(TAG, "Could not gain audio focus. Received result code " + focusResult);
@@ -90,13 +100,17 @@ public class AudioRecorder {
         recorder.start(fds[1]);
         this.recordingSubject = recordingSingle;
       } catch (IOException | RuntimeException e) {
-        recordingSingle.onError(e);
-        recorder = null;
         Log.w(TAG, e);
+        recordingUriFuture = null;
+        recorder = null;
+        audioFocusManager.abandonAudioFocus();
+        if (useMediaRecorderWrapper) {
+          startRecordingInternal(false, recordingSingle);
+        } else {
+          recordingSingle.onError(e);
+        }
       }
     });
-
-    return recordingSingle;
   }
 
   public void stopRecording() {

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

@@ -7,6 +7,7 @@ import androidx.annotation.AnyThread
 import androidx.annotation.RequiresApi
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import io.reactivex.rxjava3.subjects.SingleSubject
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.AttachmentId
@@ -29,6 +30,7 @@ object AudioWaveForms {
   private val TAG = Log.tag(AudioWaveForms::class.java)
 
   private val cache = ThreadSafeLruCache(200)
+  private val pending = hashMapOf<String, SingleSubject<AudioFileInfo>>()
 
   @AnyThread
   @JvmStatic
@@ -43,39 +45,47 @@ object AudioWaveForms {
     val cachedInfo = cache.get(cacheKey)
     if (cachedInfo != null) {
       Log.i(TAG, "Loaded wave form from cache $cacheKey")
+      synchronized(pending) {
+        pending.remove(cacheKey)
+      }
       return Single.just(cachedInfo)
     }
 
-    val databaseCache = Single.fromCallable {
-      val audioHash = attachment.audioHash
-      return@fromCallable if (audioHash != null) {
-        checkDatabaseCache(cacheKey, audioHash.audioWaveForm)
+    val pendingSubject = synchronized(pending) {
+      if (pending.containsKey(cacheKey)) {
+        Log.i(TAG, "Wave currently generating, returning existing subject")
+        return pending[cacheKey]!!
       } else {
-        Miss
+        pending[cacheKey] = SingleSubject.create()
       }
-    }.subscribeOn(Schedulers.io())
 
-    val generateWaveForm: Single<CacheCheckResult> = if (attachment is DatabaseAttachment) {
-      Single.fromCallable { generateWaveForm(context, uri, cacheKey, attachment.attachmentId) }
-    } else {
-      Single.fromCallable { generateWaveForm(context, uri, cacheKey) }
-    }.subscribeOn(Schedulers.io())
+      pending[cacheKey]!!
+    }
 
-    return databaseCache
-      .flatMap { r ->
-        if (r is Miss) {
-          generateWaveForm
+    Single.fromCallable { attachment.audioHash?.let { checkDatabaseCache(cacheKey, it.audioWaveForm) } ?: Miss }
+      .flatMap { result ->
+        if (result !is Success) {
+          if (attachment is DatabaseAttachment) {
+            Single.fromCallable { generateWaveForm(context, uri, cacheKey, attachment.attachmentId) }
+          } else {
+            Single.fromCallable { generateWaveForm(context, uri, cacheKey) }
+          }
         } else {
-          Single.just(r)
+          Single.just(result)
         }
       }
-      .map { r ->
-        if (r is Success) {
-          r.audioFileInfo
+      .map { result ->
+        if (result is Success) {
+          result.audioFileInfo
         } else {
           throw IOException("Unable to generate wave form")
         }
       }
+      .subscribeOn(Schedulers.io())
+      .observeOn(Schedulers.io())
+      .subscribe(pendingSubject)
+
+    return pendingSubject
   }
 
   private fun checkDatabaseCache(cacheKey: String, audioWaveForm: AudioWaveFormData): CacheCheckResult {

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

@@ -41,7 +41,7 @@ public class MediaRecorderWrapper implements Recorder {
       recorder.setAudioChannels(CHANNELS);
       recorder.prepare();
       recorder.start();
-    } catch (IllegalStateException e) {
+    } catch (RuntimeException e) {
       Log.w(TAG, "Unable to start recording", e);
       recorder.release();
       recorder = null;

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

@@ -41,7 +41,7 @@ class AvatarView @JvmOverloads constructor(
     }
 
     storyRing.visible = true
-    storyRing.isActivated = hasUnreadStory
+    storyRing.setBackgroundResource(if (hasUnreadStory) R.drawable.avatar_story_ring_active else R.drawable.avatar_story_ring_inactive)
 
     avatar.scaleX = storyRingScale
     avatar.scaleY = storyRingScale

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

@@ -0,0 +1,245 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup;
+
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.Conversions;
+import org.signal.core.util.logging.Log;
+import org.signal.libsignal.protocol.kdf.HKDF;
+import org.signal.libsignal.protocol.util.ByteUtil;
+import org.thoughtcrime.securesms.attachments.AttachmentId;
+import org.thoughtcrime.securesms.backup.proto.Attachment;
+import org.thoughtcrime.securesms.backup.proto.Avatar;
+import org.thoughtcrime.securesms.backup.proto.BackupFrame;
+import org.thoughtcrime.securesms.backup.proto.DatabaseVersion;
+import org.thoughtcrime.securesms.backup.proto.Header;
+import org.thoughtcrime.securesms.backup.proto.KeyValue;
+import org.thoughtcrime.securesms.backup.proto.SharedPreference;
+import org.thoughtcrime.securesms.backup.proto.SqlStatement;
+import org.thoughtcrime.securesms.backup.proto.Sticker;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.Mac;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+class BackupFrameOutputStream extends FullBackupBase.BackupStream {
+
+  private static final String TAG = Log.tag(BackupFrameOutputStream.class);
+
+  private final OutputStream outputStream;
+  private final Cipher       cipher;
+  private final Mac          mac;
+
+  private final byte[] cipherKey;
+  private final byte[] iv;
+  private       int    counter;
+
+  private int frames;
+
+  BackupFrameOutputStream(@NonNull OutputStream output, @NonNull String passphrase) throws IOException {
+    try {
+      byte[]   salt    = Util.getSecretBytes(32);
+      byte[]   key     = getBackupKey(passphrase, salt);
+      byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
+      byte[][] split   = ByteUtil.split(derived, 32, 32);
+
+      this.cipherKey = split[0];
+      byte[] macKey = split[1];
+
+      this.cipher       = Cipher.getInstance("AES/CTR/NoPadding");
+      this.mac          = Mac.getInstance("HmacSHA256");
+      this.outputStream = output;
+      this.iv           = Util.getSecretBytes(16);
+      this.counter      = Conversions.byteArrayToInt(iv);
+
+      mac.init(new SecretKeySpec(macKey, "HmacSHA256"));
+
+      byte[] header = new BackupFrame.Builder().header_(new Header.Builder()
+                                                            .iv(new okio.ByteString(iv))
+                                                            .salt(new okio.ByteString(salt))
+                                                            .version(BackupVersions.CURRENT_VERSION)
+                                                            .build())
+                                               .build()
+                                               .encode();
+
+      outputStream.write(Conversions.intToByteArray(header.length));
+      outputStream.write(header);
+    } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public void write(SharedPreference preference) throws IOException {
+    write(outputStream, new BackupFrame.Builder().preference(preference).build());
+  }
+
+  public void write(KeyValue keyValue) throws IOException {
+    write(outputStream, new BackupFrame.Builder().keyValue(keyValue).build());
+  }
+
+  public void write(SqlStatement statement) throws IOException {
+    write(outputStream, new BackupFrame.Builder().statement(statement).build());
+  }
+
+  public void write(@NonNull String avatarName, @NonNull InputStream in, long size) throws IOException {
+    try {
+      write(outputStream, new BackupFrame.Builder()
+          .avatar(new Avatar.Builder()
+                      .recipientId(avatarName)
+                      .length(Util.toIntExact(size))
+                      .build())
+          .build());
+    } catch (ArithmeticException e) {
+      Log.w(TAG, "Unable to write avatar to backup", e);
+      throw new FullBackupExporter.InvalidBackupStreamException();
+    }
+
+    if (writeStream(in) != size) {
+      throw new IOException("Size mismatch!");
+    }
+  }
+
+  public void write(@NonNull AttachmentId attachmentId, @NonNull InputStream in, long size) throws IOException {
+    try {
+      write(outputStream, new BackupFrame.Builder()
+          .attachment(new Attachment.Builder()
+                          .rowId(attachmentId.getRowId())
+                          .attachmentId(attachmentId.getUniqueId())
+                          .length(Util.toIntExact(size))
+                          .build())
+          .build());
+    } catch (ArithmeticException e) {
+      Log.w(TAG, "Unable to write " + attachmentId + " to backup", e);
+      throw new FullBackupExporter.InvalidBackupStreamException();
+    }
+
+    if (writeStream(in) != size) {
+      throw new IOException("Size mismatch!");
+    }
+  }
+
+  public void writeSticker(long rowId, @NonNull InputStream in, long size) throws IOException {
+    try {
+      write(outputStream, new BackupFrame.Builder()
+          .sticker(new Sticker.Builder()
+                       .rowId(rowId)
+                       .length(Util.toIntExact(size))
+                       .build())
+          .build());
+    } catch (ArithmeticException e) {
+      Log.w(TAG, "Unable to write sticker to backup", e);
+      throw new FullBackupExporter.InvalidBackupStreamException();
+    }
+
+    if (writeStream(in) != size) {
+      throw new IOException("Size mismatch!");
+    }
+  }
+
+  void writeDatabaseVersion(int version) throws IOException {
+    write(outputStream, new BackupFrame.Builder()
+        .version(new DatabaseVersion.Builder().version(version).build())
+        .build());
+  }
+
+  void writeEnd() throws IOException {
+    write(outputStream, new BackupFrame.Builder().end(true).build());
+  }
+
+  /**
+   * @return The amount of data written from the provided InputStream.
+   */
+  private long writeStream(@NonNull InputStream inputStream) throws IOException {
+    try {
+      Conversions.intToByteArray(iv, 0, counter++);
+      cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+      mac.update(iv);
+
+      byte[] buffer = new byte[8192];
+      long   total  = 0;
+
+      int read;
+
+      while ((read = inputStream.read(buffer)) != -1) {
+        byte[] ciphertext = cipher.update(buffer, 0, read);
+
+        if (ciphertext != null) {
+          outputStream.write(ciphertext);
+          mac.update(ciphertext);
+        }
+
+        total += read;
+      }
+
+      byte[] remainder = cipher.doFinal();
+      outputStream.write(remainder);
+      mac.update(remainder);
+
+      byte[] attachmentDigest = mac.doFinal();
+      outputStream.write(attachmentDigest, 0, 10);
+
+      return total;
+    } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  private void write(@NonNull OutputStream out, @NonNull BackupFrame frame) throws IOException {
+    try {
+      Conversions.intToByteArray(iv, 0, counter++);
+      cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+
+      byte[] encodedFrame = frame.encode();
+
+      // this assumes a stream cipher
+      byte[] length = Conversions.intToByteArray(encodedFrame.length + 10);
+      if (BackupVersions.isFrameLengthEncrypted(BackupVersions.CURRENT_VERSION)) {
+        byte[] encryptedLength = cipher.update(length);
+        if (encryptedLength.length != length.length) {
+          throw new IOException("Stream cipher assumption has been violated!");
+        }
+        mac.update(encryptedLength);
+        length = encryptedLength;
+      }
+
+      byte[] frameCiphertext = cipher.doFinal(frame.encode());
+      if (frameCiphertext.length != encodedFrame.length) {
+        throw new IOException("Stream cipher assumption has been violated!");
+      }
+
+      byte[] frameMac = mac.doFinal(frameCiphertext);
+
+      out.write(length);
+      out.write(frameCiphertext);
+      out.write(frameMac, 0, 10);
+      frames++;
+    } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public void close() throws IOException {
+    outputStream.flush();
+    outputStream.close();
+  }
+
+  public int getFrames() {
+    return frames;
+  }
+}

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

@@ -27,6 +27,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 class BackupRecordInputStream extends FullBackupBase.BackupStream {
 
+  private final int         version;
   private final InputStream in;
   private final Cipher      cipher;
   private final Mac         mac;
@@ -55,12 +56,21 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
 
       Header header = frame.header_;
 
+      if (header.iv == null) {
+        throw new IOException("Missing IV!");
+      }
+
       this.iv = header.iv.toByteArray();
 
       if (iv.length != 16) {
         throw new IOException("Invalid IV length!");
       }
 
+      this.version = header.version != null ? header.version : 0;
+      if (!BackupVersions.isCompatible(version)) {
+        throw new IOException("Invalid backup version: " + version);
+      }
+
       byte[]   key     = getBackupKey(passphrase, header.salt != null ? header.salt.toByteArray() : null);
       byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
       byte[][] split   = ByteUtil.split(derived, 32, 32);
@@ -135,7 +145,23 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
       byte[] length = new byte[4];
       StreamUtil.readFully(in, length);
 
-      byte[] frame = new byte[Conversions.byteArrayToInt(length)];
+      Conversions.intToByteArray(iv, 0, counter++);
+      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+
+      int frameLength;
+      if (BackupVersions.isFrameLengthEncrypted(version)) {
+        mac.update(length);
+        // this depends upon cipher being a stream cipher mode in order to get back the length without needing a full AES block-size input
+        byte[] decryptedLength = cipher.update(length);
+        if (decryptedLength.length != length.length) {
+          throw new IOException("Cipher was not a stream cipher!");
+        }
+        frameLength = Conversions.byteArrayToInt(decryptedLength);
+      } else {
+        frameLength = Conversions.byteArrayToInt(length);
+      }
+
+      byte[] frame = new byte[frameLength];
       StreamUtil.readFully(in, frame);
 
       byte[] theirMac = new byte[10];
@@ -148,9 +174,6 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
         throw new IOException("Bad MAC");
       }
 
-      Conversions.intToByteArray(iv, 0, counter++);
-      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
       byte[] plaintext = cipher.doFinal(frame, 0, frame.length - 10);
 
       return BackupFrame.ADAPTER.decode(plaintext);

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup
+
+object BackupVersions {
+  const val CURRENT_VERSION = 1
+  const val MINIMUM_VERSION = 0
+
+  @JvmStatic
+  fun isCompatible(version: Int): Boolean {
+    return version in MINIMUM_VERSION..CURRENT_VERSION
+  }
+
+  @JvmStatic
+  fun isFrameLengthEncrypted(version: Int): Boolean {
+    return version >= 1
+  }
+}

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

@@ -16,24 +16,15 @@ import com.annimon.stream.function.Predicate;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.Conversions;
 import org.signal.core.util.CursorUtil;
 import org.signal.core.util.SetUtil;
 import org.signal.core.util.SqlUtil;
 import org.signal.core.util.Stopwatch;
 import org.signal.core.util.logging.Log;
-import org.signal.libsignal.protocol.kdf.HKDF;
-import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
-import org.thoughtcrime.securesms.backup.proto.Attachment;
-import org.thoughtcrime.securesms.backup.proto.Avatar;
-import org.thoughtcrime.securesms.backup.proto.BackupFrame;
-import org.thoughtcrime.securesms.backup.proto.DatabaseVersion;
-import org.thoughtcrime.securesms.backup.proto.Header;
 import org.thoughtcrime.securesms.backup.proto.KeyValue;
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.backup.proto.SqlStatement;
-import org.thoughtcrime.securesms.backup.proto.Sticker;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
@@ -59,7 +50,6 @@ import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -67,9 +57,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -80,14 +67,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
 import okio.ByteString;
 
 public class FullBackupExporter extends FullBackupBase {
@@ -228,7 +207,7 @@ public class FullBackupExporter extends FullBackupBase {
         outputStream.close();
       }
     }
-    return new BackupEvent(BackupEvent.Type.FINISHED, outputStream.frames, estimatedCountOutside);
+    return new BackupEvent(BackupEvent.Type.FINISHED, outputStream.getFrames(), estimatedCountOutside);
   }
 
   private static long calculateCount(@NonNull Context context, @NonNull SQLiteDatabase input, List<String> tables) {
@@ -627,190 +606,6 @@ public class FullBackupExporter extends FullBackupBase {
     return false;
   }
 
-  private static class BackupFrameOutputStream extends BackupStream {
-
-    private final OutputStream outputStream;
-    private final Cipher       cipher;
-    private final Mac          mac;
-
-    private final byte[] cipherKey;
-    private final byte[] iv;
-    private       int    counter;
-
-    private       int    frames;
-
-    private BackupFrameOutputStream(@NonNull OutputStream output, @NonNull String passphrase) throws IOException {
-      try {
-        byte[]   salt    = Util.getSecretBytes(32);
-        byte[]   key     = getBackupKey(passphrase, salt);
-        byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
-        byte[][] split   = ByteUtil.split(derived, 32, 32);
-
-        this.cipherKey = split[0];
-        byte[] macKey  = split[1];
-
-        this.cipher       = Cipher.getInstance("AES/CTR/NoPadding");
-        this.mac          = Mac.getInstance("HmacSHA256");
-        this.outputStream = output;
-        this.iv           = Util.getSecretBytes(16);
-        this.counter      = Conversions.byteArrayToInt(iv);
-
-        mac.init(new SecretKeySpec(macKey, "HmacSHA256"));
-
-        byte[] header = new BackupFrame.Builder().header_(new Header.Builder()
-                                                                    .iv(new okio.ByteString(iv))
-                                                                    .salt(new okio.ByteString(salt))
-                                                                    .build())
-                                                 .build()
-                                                 .encode();
-
-        outputStream.write(Conversions.intToByteArray(header.length));
-        outputStream.write(header);
-      } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
-        throw new AssertionError(e);
-      }
-    }
-
-    public void write(SharedPreference preference) throws IOException {
-      write(outputStream, new BackupFrame.Builder().preference(preference).build());
-    }
-
-    public void write(KeyValue keyValue) throws IOException {
-      write(outputStream, new BackupFrame.Builder().keyValue(keyValue).build());
-    }
-
-    public void write(SqlStatement statement) throws IOException {
-      write(outputStream, new BackupFrame.Builder().statement(statement).build());
-    }
-
-    public void write(@NonNull String avatarName, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, new BackupFrame.Builder()
-                                           .avatar(new Avatar.Builder()
-                                                             .recipientId(avatarName)
-                                                             .length(Util.toIntExact(size))
-                                                             .build())
-                                           .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write avatar to backup", e);
-        throw new InvalidBackupStreamException();
-      }
-
-      if (writeStream(in) != size) {
-        throw new IOException("Size mismatch!");
-      }
-    }
-
-    public void write(@NonNull AttachmentId attachmentId, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, new BackupFrame.Builder()
-                                           .attachment(new Attachment.Builder()
-                                                                     .rowId(attachmentId.getRowId())
-                                                                     .attachmentId(attachmentId.getUniqueId())
-                                                                     .length(Util.toIntExact(size))
-                                                                     .build())
-                                           .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write " + attachmentId + " to backup", e);
-        throw new InvalidBackupStreamException();
-      }
-
-      if (writeStream(in) != size) {
-        throw new IOException("Size mismatch!");
-      }
-    }
-
-    public void writeSticker(long rowId, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, new BackupFrame.Builder()
-                                           .sticker(new Sticker.Builder()
-                                                               .rowId(rowId)
-                                                               .length(Util.toIntExact(size))
-                                                               .build())
-                                           .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write sticker to backup", e);
-        throw new InvalidBackupStreamException();
-      }
-
-      if (writeStream(in) != size) {
-        throw new IOException("Size mismatch!");
-      }
-    }
-
-    void writeDatabaseVersion(int version) throws IOException {
-      write(outputStream, new BackupFrame.Builder()
-                                         .version(new DatabaseVersion.Builder().version(version).build())
-                                         .build());
-    }
-
-    void writeEnd() throws IOException {
-      write(outputStream, new BackupFrame.Builder().end(true).build());
-    }
-
-    /**
-     * @return The amount of data written from the provided InputStream.
-     */
-    private long writeStream(@NonNull InputStream inputStream) throws IOException {
-      try {
-        Conversions.intToByteArray(iv, 0, counter++);
-        cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-        mac.update(iv);
-
-        byte[] buffer = new byte[8192];
-        long   total  = 0;
-
-        int read;
-
-        while ((read = inputStream.read(buffer)) != -1) {
-          byte[] ciphertext = cipher.update(buffer, 0, read);
-
-          if (ciphertext != null) {
-            outputStream.write(ciphertext);
-            mac.update(ciphertext);
-          }
-
-          total += read;
-        }
-
-        byte[] remainder = cipher.doFinal();
-        outputStream.write(remainder);
-        mac.update(remainder);
-
-        byte[] attachmentDigest = mac.doFinal();
-        outputStream.write(attachmentDigest, 0, 10);
-
-        return total;
-      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-        throw new AssertionError(e);
-      }
-    }
-
-    private void write(@NonNull OutputStream out, @NonNull BackupFrame frame) throws IOException {
-      try {
-        Conversions.intToByteArray(iv, 0, counter++);
-        cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
-        byte[] frameCiphertext = cipher.doFinal(frame.encode());
-        byte[] frameMac        = mac.doFinal(frameCiphertext);
-        byte[] length          = Conversions.intToByteArray(frameCiphertext.length + 10);
-
-        out.write(length);
-        out.write(frameCiphertext);
-        out.write(frameMac, 0, 10);
-        frames++;
-      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-        throw new AssertionError(e);
-      }
-    }
-
-
-    public void close() throws IOException {
-      outputStream.flush();
-      outputStream.close();
-    }
-  }
-
   public interface PostProcessor {
     int postProcess(@NonNull Cursor cursor, int count) throws IOException;
   }

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

@@ -264,12 +264,14 @@ class GiftFlowConfirmationFragment :
 
   override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
     val mainActivityIntent = MainActivity.clearTop(requireContext())
-    val conversationIntent = ConversationIntents
-      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
-      .withGiftBadge(viewModel.snapshot.giftBadge!!)
-      .build()
 
-    requireActivity().startActivities(arrayOf(mainActivityIntent, conversationIntent))
+    lifecycleDisposable += ConversationIntents
+      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
+      .subscribe { conversationIntent ->
+        requireActivity().startActivities(
+          arrayOf(mainActivityIntent, conversationIntent.withGiftBadge(viewModel.snapshot.giftBadge!!).build())
+        )
+      }
   }
 
   override fun onProcessorActionProcessed() = Unit

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeFragment.kt

@@ -47,7 +47,7 @@ class SelectFeaturedBadgeFragment : DSLSettingsFragment(
   }
 
   override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper? {
-    return Material3OnScrollHelper(requireActivity(), scrollShadow)
+    return Material3OnScrollHelper(requireActivity(), scrollShadow, viewLifecycleOwner)
   }
 
   override fun bindAdapter(adapter: MappingAdapter) {

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

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
+import org.thoughtcrime.securesms.util.FeatureFlags
 import java.net.URLDecoder
 
 /**
@@ -53,6 +54,10 @@ object CallLinks {
 
   @JvmStatic
   fun isCallLink(url: String): Boolean {
+    if (!FeatureFlags.adHocCalling()) {
+      return false
+    }
+
     if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) {
       Log.w(TAG, "Invalid url prefix.")
       return false
@@ -63,6 +68,10 @@ object CallLinks {
 
   @JvmStatic
   fun parseUrl(url: String): CallLinkRootKey? {
+    if (!FeatureFlags.adHocCalling()) {
+      return null
+    }
+
     if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) {
       Log.w(TAG, "Invalid url prefix.")
       return null

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

@@ -28,6 +28,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -35,7 +36,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.Buttons
 import org.signal.core.ui.theme.SignalTheme
-import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.conversation.colors.AvatarColorPair
 import org.thoughtcrime.securesms.database.CallLinkTable
@@ -49,10 +49,10 @@ import java.time.Instant
 @Composable
 private fun SignalCallRowPreview() {
   val callLink = remember {
-    val credentials = CallLinkCredentials.generate()
+    val credentials = CallLinkCredentials(byteArrayOf(1, 2, 3, 4), byteArrayOf(5, 6, 7, 8))
     CallLinkTable.CallLink(
       recipientId = RecipientId.UNKNOWN,
-      roomId = CallLinkRoomId.fromCallLinkRootKey(CallLinkRootKey(credentials.linkKeyBytes)),
+      roomId = CallLinkRoomId.fromBytes(byteArrayOf(1, 3, 5, 7)),
       credentials = credentials,
       state = SignalCallLinkState(
         name = "Call Name",
@@ -76,6 +76,14 @@ fun SignalCallRow(
   onJoinClicked: (() -> Unit)?,
   modifier: Modifier = Modifier
 ) {
+  val callUrl = if (LocalInspectionMode.current) {
+    "https://signal.call.example.com"
+  } else {
+    remember(callLink.credentials) {
+      callLink.credentials?.let { CallLinks.url(it.linkKeyBytes) } ?: ""
+    }
+  }
+
   Row(
     modifier = modifier
       .fillMaxWidth()
@@ -113,7 +121,7 @@ fun SignalCallRow(
         text = callLink.state.name.ifEmpty { stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__signal_call) }
       )
       Text(
-        text = callLink.credentials?.let { CallLinks.url(it.linkKeyBytes) } ?: "",
+        text = callUrl,
         style = MaterialTheme.typography.bodyMedium,
         color = MaterialTheme.colorScheme.onSurfaceVariant
       )

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

@@ -10,6 +10,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.ringrtc.CallLinkState
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobs.CallLinkUpdateSendJob
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
 import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkManager
 import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
@@ -58,6 +59,7 @@ class UpdateCallLinkRepository(
     return { result ->
       if (result is UpdateCallLinkResult.Success) {
         SignalDatabase.callLinks.updateCallLinkState(credentials.roomId, result.state)
+        ApplicationDependencies.getJobManager().add(CallLinkUpdateSendJob(credentials.roomId))
       }
     }
   }

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

@@ -46,12 +46,10 @@ import org.thoughtcrime.securesms.calls.links.CallLinks
 import org.thoughtcrime.securesms.calls.links.EditCallLinkNameDialogFragment
 import org.thoughtcrime.securesms.calls.links.SignalCallRow
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs
 import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.service.webrtc.links.CreateCallLinkResult
 import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
-import org.thoughtcrime.securesms.sharing.MultiShareArgs
+import org.thoughtcrime.securesms.sharing.v2.ShareActivity
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.Util
 
@@ -212,15 +210,10 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
     lifecycleDisposable += viewModel.commitCallLink().subscribeBy(onSuccess = {
       when (it) {
         is EnsureCallLinkCreatedResult.Success -> {
-          MultiselectForwardFragment.showFullScreen(
-            childFragmentManager,
-            MultiselectForwardFragmentArgs(
-              canSendToNonPush = false,
-              multiShareArgs = listOf(
-                MultiShareArgs.Builder()
-                  .withDraftText(CallLinks.url(viewModel.linkKeyBytes))
-                  .build()
-              )
+          startActivity(
+            ShareActivity.sendSimpleText(
+              requireContext(),
+              getString(R.string.CreateCallLink__use_this_link_to_join_a_signal_call, CallLinks.url(viewModel.linkKeyBytes))
             )
           )
         }

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
@@ -61,6 +62,7 @@ class CreateCallLinkViewModel(
 
   fun commitCallLink(): Single<EnsureCallLinkCreatedResult> {
     return repository.ensureCallLinkCreated(credentials)
+      .observeOn(AndroidSchedulers.mainThread())
   }
 
   fun setApproveAllMembers(approveAllMembers: Boolean): Single<UpdateCallLinkResult> {
@@ -74,10 +76,12 @@ class CreateCallLinkViewModel(
           is EnsureCallLinkCreatedResult.Failure -> Single.just(UpdateCallLinkResult.Failure(it.failure.status))
         }
       }
+      .observeOn(AndroidSchedulers.mainThread())
   }
 
   fun toggleApproveAllMembers(): Single<UpdateCallLinkResult> {
     return setApproveAllMembers(_callLink.value.state.restrictions != Restrictions.ADMIN_APPROVAL)
+      .observeOn(AndroidSchedulers.mainThread())
   }
 
   fun setCallName(callName: String): Single<UpdateCallLinkResult> {
@@ -91,5 +95,6 @@ class CreateCallLinkViewModel(
           is EnsureCallLinkCreatedResult.Failure -> Single.just(UpdateCallLinkResult.Failure(it.failure.status))
         }
       }
+      .observeOn(AndroidSchedulers.mainThread())
   }
 }

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

@@ -244,18 +244,20 @@ private fun CallLinkDetails(
         modifier = Modifier.padding(top = 16.dp, bottom = 12.dp)
       )
 
-      Rows.TextRow(
-        text = stringResource(id = R.string.CallLinkDetailsFragment__add_call_name),
-        onClick = callback::onEditNameClicked
-      )
+      if (state.callLink.credentials?.adminPassBytes != null) {
+        Rows.TextRow(
+          text = stringResource(id = R.string.CallLinkDetailsFragment__add_call_name),
+          onClick = callback::onEditNameClicked
+        )
 
-      Rows.ToggleRow(
-        checked = state.callLink.state.restrictions == Restrictions.ADMIN_APPROVAL,
-        text = stringResource(id = R.string.CallLinkDetailsFragment__approve_all_members),
-        onCheckChanged = callback::onApproveAllMembersChanged
-      )
+        Rows.ToggleRow(
+          checked = state.callLink.state.restrictions == Restrictions.ADMIN_APPROVAL,
+          text = stringResource(id = R.string.CallLinkDetailsFragment__approve_all_members),
+          onCheckChanged = callback::onApproveAllMembersChanged
+        )
 
-      Dividers.Default()
+        Dividers.Default()
+      }
 
       Rows.TextRow(
         text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),

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

@@ -215,7 +215,15 @@ class CallLogAdapter(
       binding.callInfo.setRelativeDrawables(start = R.drawable.symbol_link_compact_16)
       binding.callInfo.setText(R.string.CallLogAdapter__call_link)
 
+      TextViewCompat.setCompoundDrawableTintList(
+        binding.callInfo,
+        ColorStateList.valueOf(
+          ContextCompat.getColor(context, R.color.signal_colorOnSurfaceVariant)
+        )
+      )
+
       binding.callType.setImageResource(R.drawable.symbol_video_24)
+      binding.callType.contentDescription = context.getString(R.string.CallLogAdapter__start_a_video_call)
       binding.callType.setOnClickListener {
         onStartVideoCallClicked(model.callLink.recipient)
       }
@@ -306,6 +314,7 @@ class CallLogAdapter(
       when (model.call.record.type) {
         CallTable.Type.AUDIO_CALL -> {
           binding.callType.setImageResource(R.drawable.symbol_phone_24)
+          binding.callType.contentDescription = context.getString(R.string.CallLogAdapter__start_a_voice_call)
           binding.callType.setOnClickListener { onStartAudioCallClicked(model.call.peer) }
           binding.callType.visible = true
           binding.groupCallButton.visible = false
@@ -313,6 +322,7 @@ class CallLogAdapter(
 
         CallTable.Type.VIDEO_CALL -> {
           binding.callType.setImageResource(R.drawable.symbol_video_24)
+          binding.callType.contentDescription = context.getString(R.string.CallLogAdapter__start_a_video_call)
           binding.callType.setOnClickListener { onStartVideoCallClicked(model.call.peer) }
           binding.callType.visible = true
           binding.groupCallButton.visible = false
@@ -320,6 +330,7 @@ class CallLogAdapter(
 
         CallTable.Type.GROUP_CALL, CallTable.Type.AD_HOC_CALL -> {
           binding.callType.setImageResource(R.drawable.symbol_video_24)
+          binding.callType.contentDescription = context.getString(R.string.CallLogAdapter__start_a_video_call)
           binding.callType.setOnClickListener { onStartVideoCallClicked(model.call.peer) }
           binding.groupCallButton.setOnClickListener { onStartVideoCallClicked(model.call.peer) }
 
@@ -354,7 +365,7 @@ class CallLogAdapter(
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE, MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_upright_compact_16
         MessageTypes.GROUP_CALL_TYPE -> when {
           call.type == CallTable.Type.AD_HOC_CALL -> R.drawable.symbol_link_compact_16
-          call.event == CallTable.Event.MISSED -> R.drawable.symbol_missed_incoming_24
+          call.event == CallTable.Event.MISSED -> R.drawable.symbol_missed_incoming_compact_16
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.drawable.symbol_group_compact_16
           call.direction == CallTable.Direction.INCOMING -> R.drawable.symbol_arrow_downleft_compact_16
           call.direction == CallTable.Direction.OUTGOING -> R.drawable.symbol_arrow_upright_compact_16

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

@@ -4,6 +4,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsActivity
 import org.thoughtcrime.securesms.components.menu.ActionItem
@@ -21,6 +23,9 @@ class CallLogContextMenu(
   private val fragment: Fragment,
   private val callbacks: Callbacks
 ) {
+
+  private val lifecycleDisposable by lazy { LifecycleDisposable().bindTo(fragment.viewLifecycleOwner) }
+
   fun show(recyclerView: RecyclerView, anchor: View, call: CallLogRow.Call) {
     recyclerView.suppressLayout(true)
     anchor.isSelected = true
@@ -91,7 +96,10 @@ class CallLogContextMenu(
         iconRes = R.drawable.symbol_open_24,
         title = fragment.getString(R.string.CallContextMenu__go_to_chat)
       ) {
-        fragment.startActivity(ConversationIntents.createBuilder(fragment.requireContext(), call.peer.id, -1L).build())
+        lifecycleDisposable += ConversationIntents.createBuilder(fragment.requireContext(), call.peer.id, -1L)
+          .subscribeBy {
+            fragment.startActivity(it.build())
+          }
       }
     }
   }

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

@@ -5,11 +5,14 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.calls.links.UpdateCallLinkRepository
+import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.CallLinkPeekJob
+import org.thoughtcrime.securesms.jobs.CallLogEventSendJob
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
 
@@ -80,6 +83,23 @@ class CallLogRepository(
     }.subscribeOn(Schedulers.io())
   }
 
+  /**
+   * Delete all call events / unowned links and enqueue clear history job, and then
+   * emit a clear history message.
+   */
+  fun deleteAllCallLogsOnOrBeforeNow(): Single<Int> {
+    return Single.fromCallable {
+      SignalDatabase.rawDatabase.withinTransaction {
+        val now = System.currentTimeMillis()
+        SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(now)
+        SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(now)
+        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forClearHistory(now))
+      }
+
+      SignalDatabase.callLinks.getAllAdminCallLinksExcept(emptySet())
+    }.flatMap(this::revokeAndCollectResults).map { -1 }.subscribeOn(Schedulers.io())
+  }
+
   /**
    * Deletes the selected call links. We DELETE those links we don't have admin keys for,
    * and revoke the ones we *do* have admin keys for. We then perform a cleanup step on
@@ -93,19 +113,7 @@ class CallLogRepository(
       val allCallLinkIds = SignalDatabase.calls.getCallLinkRoomIdsFromCallRowIds(selectedCallRowIds) + selectedRoomIds
       SignalDatabase.callLinks.deleteNonAdminCallLinks(allCallLinkIds)
       SignalDatabase.callLinks.getAdminCallLinks(allCallLinkIds)
-    }.flatMap { callLinksToRevoke ->
-      Single.merge(
-        callLinksToRevoke.map {
-          updateCallLinkRepository.revokeCallLink(it.credentials!!)
-        }
-      ).reduce(0) { acc, current ->
-        acc + (if (current is UpdateCallLinkResult.Success) 0 else 1)
-      }
-    }.doOnTerminate {
-      SignalDatabase.calls.updateAdHocCallEventDeletionTimestamps()
-    }.doOnDispose {
-      SignalDatabase.calls.updateAdHocCallEventDeletionTimestamps()
-    }.subscribeOn(Schedulers.io())
+    }.flatMap(this::revokeAndCollectResults).subscribeOn(Schedulers.io())
   }
 
   /**
@@ -121,19 +129,21 @@ class CallLogRepository(
       val allCallLinkIds = SignalDatabase.calls.getCallLinkRoomIdsFromCallRowIds(selectedCallRowIds) + selectedRoomIds
       SignalDatabase.callLinks.deleteAllNonAdminCallLinksExcept(allCallLinkIds)
       SignalDatabase.callLinks.getAllAdminCallLinksExcept(allCallLinkIds)
-    }.flatMap { callLinksToRevoke ->
-      Single.merge(
-        callLinksToRevoke.map {
-          updateCallLinkRepository.revokeCallLink(it.credentials!!)
-        }
-      ).reduce(0) { acc, current ->
-        acc + (if (current is UpdateCallLinkResult.Success) 0 else 1)
+    }.flatMap(this::revokeAndCollectResults).subscribeOn(Schedulers.io())
+  }
+
+  private fun revokeAndCollectResults(callLinksToRevoke: Set<CallLinkTable.CallLink>): Single<Int> {
+    return Single.merge(
+      callLinksToRevoke.map {
+        updateCallLinkRepository.revokeCallLink(it.credentials!!)
       }
+    ).reduce(0) { acc, current ->
+      acc + (if (current is UpdateCallLinkResult.Success) 0 else 1)
     }.doOnTerminate {
       SignalDatabase.calls.updateAdHocCallEventDeletionTimestamps()
     }.doOnDispose {
       SignalDatabase.calls.updateAdHocCallEventDeletionTimestamps()
-    }.subscribeOn(Schedulers.io())
+    }
   }
 
   fun peekCallLinks(): Completable {

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

@@ -93,7 +93,7 @@ sealed class CallLogRow {
           return FULL
         }
 
-        if (groupCallUpdateDetails.inCallUuidsList.contains(Recipient.self().requireServiceId().uuid().toString())) {
+        if (groupCallUpdateDetails.inCallUuidsList.contains(Recipient.self().requireAci().rawUuid.toString())) {
           return LOCAL_USER_JOINED
         }
 

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

@@ -3,17 +3,17 @@ package org.thoughtcrime.securesms.calls.log
 /**
  * Selection state object for call logs.
  */
-sealed class CallLogSelectionState {
-  abstract fun contains(callId: CallLogRow.Id): Boolean
-  abstract fun isNotEmpty(totalCount: Int): Boolean
+sealed interface CallLogSelectionState {
+  fun contains(callId: CallLogRow.Id): Boolean
+  fun isNotEmpty(totalCount: Int): Boolean
 
-  abstract fun count(totalCount: Int): Int
+  fun count(totalCount: Int): Int
 
-  abstract fun selected(): Set<CallLogRow.Id>
+  fun selected(): Set<CallLogRow.Id>
   fun isExclusionary(): Boolean = this is Excludes
 
-  protected abstract fun select(callId: CallLogRow.Id): CallLogSelectionState
-  protected abstract fun deselect(callId: CallLogRow.Id): CallLogSelectionState
+  fun select(callId: CallLogRow.Id): CallLogSelectionState
+  fun deselect(callId: CallLogRow.Id): CallLogSelectionState
 
   fun toggle(callId: CallLogRow.Id): CallLogSelectionState {
     return if (contains(callId)) {
@@ -26,7 +26,7 @@ sealed class CallLogSelectionState {
   /**
    * Includes contains an opt-in list of call logs.
    */
-  data class Includes(private val includes: Set<CallLogRow.Id>) : CallLogSelectionState() {
+  data class Includes(private val includes: Set<CallLogRow.Id>) : CallLogSelectionState {
     override fun contains(callId: CallLogRow.Id): Boolean {
       return includes.contains(callId)
     }
@@ -55,7 +55,7 @@ sealed class CallLogSelectionState {
   /**
    * Excludes contains an opt-out list of call logs.
    */
-  data class Excludes(private val excluded: Set<CallLogRow.Id>) : CallLogSelectionState() {
+  data class Excludes(private val excluded: Set<CallLogRow.Id>) : CallLogSelectionState {
     override fun contains(callId: CallLogRow.Id): Boolean = !excluded.contains(callId)
     override fun isNotEmpty(totalCount: Int): Boolean = excluded.size < totalCount
 
@@ -74,8 +74,10 @@ sealed class CallLogSelectionState {
     override fun selected(): Set<CallLogRow.Id> = excluded
   }
 
+  object All : CallLogSelectionState by Excludes(emptySet())
+
   companion object {
     fun empty(): CallLogSelectionState = Includes(emptySet())
-    fun selectAll(): CallLogSelectionState = Excludes(emptySet())
+    fun selectAll(): CallLogSelectionState = All
   }
 }

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

@@ -35,14 +35,21 @@ class CallLogStagedDeletion(
       .map { it.roomId }
       .toSet()
 
-    return if (stateSnapshot.isExclusionary()) {
-      repository.deleteAllCallLogsExcept(callRowIds, filter == CallLogFilter.MISSED).andThen(
-        repository.deleteAllCallLinksExcept(callRowIds, callLinkIds)
-      )
-    } else {
-      repository.deleteSelectedCallLogs(callRowIds).andThen(
-        repository.deleteSelectedCallLinks(callRowIds, callLinkIds)
-      )
+    return when {
+      stateSnapshot is CallLogSelectionState.All && filter == CallLogFilter.ALL -> {
+        repository.deleteAllCallLogsOnOrBeforeNow()
+      }
+      stateSnapshot is CallLogSelectionState.Excludes || stateSnapshot is CallLogSelectionState.All -> {
+        repository.deleteAllCallLogsExcept(callRowIds, filter == CallLogFilter.MISSED).andThen(
+          repository.deleteAllCallLinksExcept(callRowIds, callLinkIds)
+        )
+      }
+      stateSnapshot is CallLogSelectionState.Includes -> {
+        repository.deleteSelectedCallLogs(callRowIds).andThen(
+          repository.deleteSelectedCallLinks(callRowIds, callLinkIds)
+        )
+      }
+      else -> error("Unhandled state $stateSnapshot $filter")
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt

@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.util.views.SimpleProgressDialog
 import java.io.IOException
 import java.util.Optional
 import java.util.function.Consumer
+import kotlin.time.Duration.Companion.seconds
 
 class NewCallActivity : ContactSelectionActivity(), ContactSelectionListFragment.NewCallCallback {
 
@@ -49,7 +50,7 @@ class NewCallActivity : ContactSelectionActivity(), ContactSelectionListFragment
           if (!resolved.isRegistered || !resolved.hasServiceId()) {
             Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.")
             resolved = try {
-              refresh(this, resolved, false)
+              refresh(this, resolved, false, 10.seconds.inWholeMilliseconds)
               Recipient.resolved(resolved.id)
             } catch (e: IOException) {
               Log.w(TAG, "[onContactSelected] Failed to refresh directory for new contact.")

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

@@ -1,23 +1,16 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.os.Build.VERSION_CODES;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 
-import org.signal.core.util.logging.Log;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+
 import org.thoughtcrime.securesms.R;
 
-public class AlertView extends LinearLayout {
-
-  private static final String TAG = Log.tag(AlertView.class);
-
-  private ImageView approvalIndicator;
-  private ImageView failedIndicator;
+public class AlertView extends AppCompatImageView {
 
   public AlertView(Context context) {
     this(context, null);
@@ -25,53 +18,38 @@ public class AlertView extends LinearLayout {
 
   public AlertView(Context context, AttributeSet attrs) {
     super(context, attrs);
-    initialize(attrs);
+    initialize();
   }
 
   public AlertView(final Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
-    initialize(attrs);
+    initialize();
   }
 
-  private void initialize(AttributeSet attrs) {
-    inflate(getContext(), R.layout.alert_view, this);
-
-    approvalIndicator = findViewById(R.id.pending_approval_indicator);
-    failedIndicator   = findViewById(R.id.sms_failed_indicator);
-
-    if (attrs != null) {
-      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.AlertView, 0, 0);
-      boolean useSmallIcon = typedArray.getBoolean(R.styleable.AlertView_useSmallIcon, false);
-      typedArray.recycle();
-
-      if (useSmallIcon) {
-        int size = getResources().getDimensionPixelOffset(R.dimen.alertview_small_icon_size);
-        failedIndicator.getLayoutParams().width  = size;
-        failedIndicator.getLayoutParams().height = size;
-        requestLayout();
-      }
-    }
+  private void initialize() {
+    setImageResource(R.drawable.symbol_error_circle_compact_16);
+    setScaleType(ScaleType.FIT_CENTER);
   }
 
   public void setNone() {
-    this.setVisibility(View.GONE);
+    setVisibility(View.GONE);
   }
 
   public void setPendingApproval() {
-    this.setVisibility(View.VISIBLE);
-    approvalIndicator.setVisibility(View.VISIBLE);
-    failedIndicator.setVisibility(View.GONE);
+    setVisibility(View.VISIBLE);
+    setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_colorOnSurfaceVariant));
+    setContentDescription(getContext().getString(R.string.conversation_item_sent__pending_approval_description));
   }
 
   public void setFailed() {
-    this.setVisibility(View.VISIBLE);
-    approvalIndicator.setVisibility(View.GONE);
-    failedIndicator.setVisibility(View.VISIBLE);
+    setVisibility(View.VISIBLE);
+    setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_colorError));
+    setContentDescription(getContext().getString(R.string.conversation_item_sent__send_failed_indicator_description));
   }
 
   public void setRateLimited() {
-    this.setVisibility(View.VISIBLE);
-    approvalIndicator.setVisibility(View.VISIBLE);
-    failedIndicator.setVisibility(View.GONE);
+    setVisibility(View.VISIBLE);
+    setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_colorOnSurfaceVariant));
+    setContentDescription(getContext().getString(R.string.conversation_item_sent__pending_approval_description));
   }
 }

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

@@ -176,7 +176,6 @@ public final class AudioView extends FrameLayout {
                        final boolean showControls,
                        final boolean forceHideDuration)
   {
-    this.disposable.dispose();
     this.callbacks = callbacks;
 
     if (duration != null) {
@@ -213,25 +212,26 @@ public final class AudioView extends FrameLayout {
       showPlayButton();
     }
 
-    this.audioSlide = audio;
-
     if (seekBar instanceof WaveFormSeekBarView) {
       WaveFormSeekBarView waveFormView = (WaveFormSeekBarView) seekBar;
       waveFormView.setColors(waveFormPlayedBarsColor, waveFormUnplayedBarsColor, waveFormThumbTint);
       if (android.os.Build.VERSION.SDK_INT >= 23) {
-        disposable = AudioWaveForms.getWaveForm(getContext(), audioSlide.asAttachment())
-                                   .observeOn(AndroidSchedulers.mainThread())
-                                   .subscribe(
-                                        data -> {
-                                          durationMillis = data.getDuration(TimeUnit.MILLISECONDS);
-                                          updateProgress(0, 0);
-                                          if (!forceHideDuration && duration != null) {
-                                            duration.setVisibility(VISIBLE);
-                                          }
-                                          waveFormView.setWaveData(data.getWaveForm());
-                                        },
-                                        t -> waveFormView.setWaveMode(false)
-                                    );
+        if (audioSlide == null || !Objects.equals(audioSlide.getUri(), audio.getUri())) {
+          disposable.dispose();
+          disposable = AudioWaveForms.getWaveForm(getContext(), audio.asAttachment())
+                                     .observeOn(AndroidSchedulers.mainThread())
+                                     .subscribe(
+                                         data -> {
+                                           durationMillis = data.getDuration(TimeUnit.MILLISECONDS);
+                                           updateProgress(0, 0);
+                                           if (!forceHideDuration && duration != null) {
+                                             duration.setVisibility(VISIBLE);
+                                           }
+                                           waveFormView.setWaveData(data.getWaveForm());
+                                         },
+                                         t -> waveFormView.setWaveMode(false)
+                                     );
+        }
       } else {
         waveFormView.setWaveMode(false);
         if (duration != null) {
@@ -243,6 +243,8 @@ public final class AudioView extends FrameLayout {
     if (forceHideDuration && duration != null) {
       duration.setVisibility(View.GONE);
     }
+
+    this.audioSlide = audio;
   }
 
   public void setDownloadClickListener(@Nullable SlideClickListener listener) {

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

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Path
-import android.graphics.Rect
 import android.graphics.RectF
 import android.util.AttributeSet
 import androidx.core.graphics.withClip
@@ -18,15 +17,15 @@ class ClippedCardView @JvmOverloads constructor(
   attrs: AttributeSet? = null
 ) : MaterialCardView(context, attrs) {
 
-  private val bounds = Rect()
   private val boundsF = RectF()
   private val path = Path()
 
-  override fun draw(canvas: Canvas) {
-    canvas.getClipBounds(bounds)
-    boundsF.set(bounds)
-    path.reset()
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    boundsF.set(0f, 0f, w.toFloat(), h.toFloat())
+  }
 
+  override fun draw(canvas: Canvas) {
+    path.reset()
     path.addRoundRect(boundsF, radius, radius, Path.Direction.CW)
     canvas.withClip(path) {
       super.draw(canvas)

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

@@ -9,13 +9,11 @@ import android.text.Annotation;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
-import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
-import android.text.style.RelativeSizeSpan;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -49,7 +47,6 @@ import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.List;
@@ -65,7 +62,6 @@ public class ComposeText extends EmojiEditText {
   private static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
 
   private CharSequence            hint;
-  private SpannableString         subHint;
   private MentionRendererDelegate mentionRendererDelegate;
   private SpoilerRendererDelegate spoilerRendererDelegate;
   private MentionValidatorWatcher mentionValidatorWatcher;
@@ -106,13 +102,7 @@ public class ComposeText extends EmojiEditText {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
     if (getLayout() != null && !TextUtils.isEmpty(hint)) {
-      if (!TextUtils.isEmpty(subHint)) {
-        setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(hint))
-                                                      .append("\n")
-                                                      .append(ellipsizeToWidth(subHint)));
-      } else {
-        setHintWithChecks(ellipsizeToWidth(hint));
-      }
+      setHintWithChecks(ellipsizeToWidth(hint));
       super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
   }
@@ -173,30 +163,17 @@ public class ComposeText extends EmojiEditText {
                                TruncateAt.END);
   }
 
-  public void setHint(@NonNull String hint, @Nullable CharSequence subHint) {
+  public void setHint(@NonNull String hint) {
     this.hint = hint;
-
-    if (subHint != null) {
-      this.subHint = new SpannableString(subHint);
-      this.subHint.setSpan(new RelativeSizeSpan(0.5f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-    } else {
-      this.subHint = null;
-    }
-
-    if (this.subHint != null) {
-      setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint))
-                                                    .append("\n")
-                                                    .append(ellipsizeToWidth(this.subHint)));
-    } else {
-      setHintWithChecks(ellipsizeToWidth(this.hint));
-    }
-
-    setHintWithChecks(hint);
+    setHintWithChecks(ellipsizeToWidth(this.hint));
   }
 
   public void setDraftText(@Nullable CharSequence draftText) {
     setText("");
-    append(draftText);
+
+    if (draftText != null) {
+      append(draftText);
+    }
   }
 
   public void appendInvite(String invite) {
@@ -246,10 +223,7 @@ public class ComposeText extends EmojiEditText {
     }
 
     setImeOptions(imeOptions);
-    setHint(getContext().getString(messageSendType.getComposeHintRes()),
-            messageSendType.getSimName() != null
-                ? getContext().getString(R.string.conversation_activity__from_sim_name, messageSendType.getSimName())
-                : null);
+    setHint(getContext().getString(messageSendType.getComposeHintRes()));
     setInputType(inputType);
   }
 

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

@@ -46,11 +46,17 @@ class ComposeTextStyleWatcher : TextWatcher {
 
     try {
       if (editStart < 0 || editEnd < 0 || editStart >= editEnd || (editStart == 0 && editEnd == s.length)) {
+        textSnapshotPriorToChange = null
         return
       }
 
       val change = s.subSequence(editStart, editEnd)
-      if (change.isEmpty() || textSnapshotPriorToChange == null || (editEnd - editStart == 1 && !StringUtil.isVisuallyEmpty(change[0])) || TextUtils.equals(textSnapshotPriorToChange, change)) {
+      if (change.isEmpty() ||
+        textSnapshotPriorToChange == null ||
+        (editEnd - editStart == 1 && !StringUtil.isVisuallyEmpty(change[0])) ||
+        TextUtils.equals(textSnapshotPriorToChange, change) ||
+        editEnd - editStart > 1
+      ) {
         textSnapshotPriorToChange = null
         return
       }