Bump version to 6.41.3

Relates to #13273

.github/workflows/android.yml

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

.github/workflows/diffuse.yml

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

.gitignore

@@ -3,6 +3,7 @@ captures/
 project.properties
 keystore.debug.properties
 keystore.staging.properties
+nightly-url.txt
 .project
 .settings
 bin/
@@ -28,4 +29,4 @@ jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
 maps.key
-local/
+local/

.gitmodules

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

CONTRIBUTING.md

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

app/build.gradle

@@ -3,34 +3,18 @@ import com.android.build.api.dsl.ManagedVirtualDevice
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.protobuf'
     id 'androidx.navigation.safeargs'
     id 'org.jlleitschuh.gradle.ktlint'
     id 'org.jetbrains.kotlin.android'
     id 'app.cash.exhaustive'
     id 'kotlin-parcelize'
     id 'com.squareup.wire'
-    id 'android-constants'
     id 'translations'
+    id 'licenses'
 }
 
 apply from: 'static-ips.gradle'
 
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.18.0'
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java {
-                    option "lite"
-                }
-            }
-        }
-    }
-}
-
 wire {
     kotlin {
         javaInterop = true
@@ -39,14 +23,18 @@ wire {
     sourcePath {
         srcDir 'src/main/protowire'
     }
+
+    protoPath {
+        srcDir "${project.rootDir}/libsignal-service/src/main/protowire"
+    }
 }
 
 ktlint {
     version = "0.49.1"
 }
 
-def canonicalVersionCode = 1312
-def canonicalVersionName = "6.29.1"
+def canonicalVersionCode = 1365
+def canonicalVersionName = "6.41.3"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -94,7 +82,7 @@ android {
     testBuildType 'instrumentation'
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = signalKotlinJvmTarget
         freeCompilerArgs = ["-Xallow-result-return-type"]
     }
 
@@ -181,6 +169,7 @@ android {
         buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
+        buildConfigField "String", "SIGNAL_CDN3_URL", "\"https://cdn3.signal.org\""
         buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\""
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
@@ -195,7 +184,7 @@ android {
         buildConfigField "String[]", "SIGNAL_STORAGE_IPS", storage_ips
         buildConfigField "String[]", "SIGNAL_CDN_IPS", cdn_ips
         buildConfigField "String[]", "SIGNAL_CDN2_IPS", cdn2_ips
-        buildConfigField "String[]", "SIGNAL_KBS_IPS", kbs_ips
+        buildConfigField "String[]", "SIGNAL_CDN3_IPS", cdn3_ips
         buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
         buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
         buildConfigField "String[]", "SIGNAL_CDSI_IPS", cdsi_ips
@@ -203,12 +192,6 @@ android {
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
         buildConfigField "String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\""
         buildConfigField "String", "SVR2_MRENCLAVE", "\"6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094\""
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5\", " +
-                                                                                                                           "\"3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89\", " +
-                                                                                                                           "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
-                                                                                                                                                                             "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
-                                                                                                                                                                             "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P\""
         buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\""
@@ -336,26 +319,27 @@ android {
         play {
             dimension 'distribution'
             isDefault true
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "boolean", "MANAGES_APP_UPDATES", "false"
+            buildConfigField "String", "APK_UPDATE_MANIFEST_URL", "null"
             buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
         }
 
         website {
             dimension 'distribution'
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+            buildConfigField "boolean", "MANAGES_APP_UPDATES", "true"
+            buildConfigField "String", "APK_UPDATE_MANIFEST_URL", "\"https://updates.signal.org/android/latest.json\""
             buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
         }
 
         nightly {
+            def apkUpdateManifestUrl = "<unset>"
+            if (file("${project.rootDir}/nightly-url.txt").exists()) {
+                apkUpdateManifestUrl = file("${project.rootDir}/nightly-url.txt").text.trim()
+            }
             dimension 'distribution'
             versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "boolean", "MANAGES_APP_UPDATES", "true"
+            buildConfigField "String", "APK_UPDATE_MANIFEST_URL", "\"${apkUpdateManifestUrl}\""
             buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\""
         }
 
@@ -377,16 +361,11 @@ android {
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\""
             buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
             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\", " +
-                                                                                                                               "\"ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa\", " +
-                                                                                                                               "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
-                                                                                                                                                                                 "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
-                                                                                                                                                                                 "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj\""
             buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\""
@@ -425,6 +404,9 @@ android {
                         tag = tag.substring(1)
                     }
                     output.versionNameOverride = tag
+                    output.outputFileName = output.outputFileName.replace(".apk", "-${output.versionNameOverride}.apk")
+                } else {
+                    output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
                 }
             } else {
                 output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
@@ -511,7 +493,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
@@ -529,13 +511,11 @@ dependencies {
     implementation project(':sms-exporter')
     implementation project(':sticky-header-grid')
     implementation project(':photoview')
+    implementation project(':glide-webp')
 
     implementation libs.libsignal.android
-    implementation libs.google.protobuf.javalite
 
-    implementation(libs.mobilecoin) {
-        exclude group: 'com.google.protobuf'
-    }
+    implementation libs.mobilecoin
 
     implementation libs.signal.ringrtc
 
@@ -590,6 +570,7 @@ dependencies {
     testImplementation testLibs.robolectric.shadows.multidex
     testImplementation (testLibs.bouncycastle.bcprov.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
     testImplementation (testLibs.bouncycastle.bcpkix.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
+    testImplementation testLibs.conscrypt.openjdk.uber // Used by robolectric
     testImplementation testLibs.hamcrest.hamcrest
     testImplementation testLibs.mockk
 
@@ -685,6 +666,24 @@ tasks.withType(Test) {
     }
 }
 
+project.tasks.configureEach { task ->
+    if (task.name.toLowerCase().contains("nightly") && task.name != 'checkNightlyParams') {
+        task.dependsOn checkNightlyParams
+    }
+}
+
+tasks.register('checkNightlyParams') {
+    doFirst {
+        if (project.gradle.startParameter.taskNames.any { it.toLowerCase().contains("nightly") }) {
+
+            if (!file("${project.rootDir}/nightly-url.txt").exists()) {
+                throw new GradleException("Cannot fine 'nightly-url.txt' for nightly build! It must exist in the root of this project and contain the location of the nightly manifest.")
+            }
+        }
+    }
+}
+
+
 def loadKeystoreProperties(filename) {
     def keystorePropertiesFile = file("${project.rootDir}/${filename}")
     if (keystorePropertiesFile.exists()) {

app/proguard/proguard.cfg

@@ -4,6 +4,7 @@
 -keep class org.whispersystems.** { *; }
 -keep class org.signal.libsignal.protocol.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
+-keep class org.signal.donations.json.** { *; }
 -keepclassmembers class ** {
     public void onEvent*(**);
 }

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

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

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

@@ -50,7 +50,6 @@ class ChangeNumberViewModelTest {
 
   @Before
   fun setUp() {
-    ApplicationDependencies.getSignalServiceAccountManager().setSoTimeoutMillis(1000)
     ThreadUtil.runOnMainSync {
       viewModel = ChangeNumberViewModel(
         localNumber = harness.self.requireE164(),
@@ -231,8 +230,6 @@ class ChangeNumberViewModelTest {
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
-    MockProvider.mockGetRegistrationLockStringFlow()
-
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
       Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
@@ -319,8 +316,6 @@ class ChangeNumberViewModelTest {
     lateinit var changeNumberRequest: ChangePhoneNumberRequest
     lateinit var setPreKeysRequest: PreKeyState
 
-    MockProvider.mockGetRegistrationLockStringFlow()
-
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
       Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },

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

@@ -9,8 +9,9 @@ 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.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -64,7 +65,8 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
@@ -73,7 +75,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
-    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     ThreadUtil.sleep(1)
   }
@@ -83,7 +85,8 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
@@ -92,7 +95,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
-    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    val insert = SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
 //      if (index != 1) {
@@ -144,6 +147,7 @@ class ConversationItemPreviewer {
       1024,
       Optional.empty(),
       Optional.empty(),
+      0,
       Optional.of("/not-there.jpg"),
       false,
       false,

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

@@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.conversation.v2.items
 import android.net.Uri
 import android.view.View
 import androidx.lifecycle.Observer
+import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
@@ -28,6 +29,7 @@ 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.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stickers.StickerLocator
@@ -45,7 +47,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(),
       isGroupThread = false,
       adapterPosition = 5
@@ -67,7 +68,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.END
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -89,7 +89,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.START
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(prev),
       isGroupThread = false,
       adapterPosition = 5
@@ -113,7 +112,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.MIDDLE
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -135,7 +133,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -157,7 +154,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(prev),
       isGroupThread = false,
       adapterPosition = 5
@@ -181,7 +177,6 @@ class V2ConversationItemShapeTest {
 
     val expected = V2ConversationItemShape.MessageShape.SINGLE
     val actual = testSubject.setMessageShape(
-      isLtr = true,
       currentMessage = getMessageRecord(now),
       isGroupThread = false,
       adapterPosition = 5
@@ -208,12 +203,14 @@ class V2ConversationItemShapeTest {
 
     private val colorizer = Colorizer()
 
-    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.STANDARD
+    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.Standard
 
     override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
     override val selectedItems: Set<MultiselectPart> = emptySet()
     override val isMessageRequestAccepted: Boolean = true
     override val searchQuery: String? = null
+    override val glideRequests: GlideRequests = mockk()
+    override val isParentInScroll: Boolean = false
 
     override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit
 

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

@@ -134,6 +134,40 @@ class AttachmentTableTest {
     highInfo.file.exists() assertIs true
   }
 
+  /**
+   * Given: Three pre-upload attachments with the same data but different transform properties (1x standard and 2x high).
+   *
+   * When inserting content of high pre-upload attachment.
+   *
+   * Then do not deduplicate with standard pre-upload attachment, but do deduplicate second high insert.
+   */
+  @Test
+  fun doNotDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
+    // GIVEN
+    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+
+    val standardQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.empty())
+    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
+
+    // WHEN
+    val highQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
+    val highDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityPreUpload)
+
+    val secondHighQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
+    val secondHighDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondHighQualityPreUpload)
+
+    // THEN
+    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    val secondHighInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(secondHighDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+
+    highInfo.file assertIsNot standardInfo.file
+    secondHighInfo.file assertIs highInfo.file
+    standardInfo.file.exists() assertIs true
+    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/GroupTableTest.kt

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

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/LogDatabaseTest.kt

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

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

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

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

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.Optional
@@ -55,9 +55,9 @@ object MmsHelper {
   }
 
   fun insert(
-    message: IncomingMediaMessage,
+    message: IncomingMessage,
     threadId: Long
   ): Optional<MessageTable.InsertResult> {
-    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
+    return SignalDatabase.messages.insertMessageInbox(message, threadId)
   }
 }

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

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -73,7 +73,8 @@ class MmsTableTest_stories {
     )
 
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -95,7 +96,8 @@ class MmsTableTest_stories {
     // GIVEN
     val sender = recipients[0]
     val messageId = MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -122,7 +124,8 @@ class MmsTableTest_stories {
     // GIVEN
     val messageIds = recipients.take(5).map {
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = it,
           sentTimeMillis = 2,
           serverTimeMillis = 2,
@@ -154,7 +157,8 @@ class MmsTableTest_stories {
     val unviewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
@@ -168,7 +172,8 @@ class MmsTableTest_stories {
     val viewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
@@ -213,7 +218,8 @@ class MmsTableTest_stories {
   fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
     // GIVEN
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = recipients[0],
         sentTimeMillis = 200,
         serverTimeMillis = 2,
@@ -321,7 +327,8 @@ class MmsTableTest_stories {
     )
 
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = myStory.id,
         sentTimeMillis = 201,
         serverTimeMillis = 201,

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_applyStorageSyncContactUpdate.kt

@@ -38,8 +38,8 @@ class RecipientTableTest_applyStorageSyncContactUpdate {
 
     val newProto = oldRecord
       .toProto()
-      .toBuilder()
-      .setIdentityState(ContactRecord.IdentityState.DEFAULT)
+      .newBuilder()
+      .identityState(ContactRecord.IdentityState.DEFAULT)
       .build()
     val newRecord = SignalContactRecord(oldRecord.id, newProto)
 

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

@@ -14,8 +14,10 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.signal.core.util.Base64
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.exists
+import org.signal.core.util.orNull
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
@@ -34,12 +36,10 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-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.thoughtcrime.securesms.util.Util
@@ -60,21 +60,6 @@ class RecipientTableTest_getAndPossiblyMerge {
     FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
   }
 
-  @Test
-  fun single() {
-    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
   fun allNonMergeTests() {
     test("e164-only insert") {
@@ -85,7 +70,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       assertEquals(RecipientTable.RegisteredState.UNKNOWN, record.registered)
     }
 
-    test("pni-only insert", exception = IllegalArgumentException::class.java) {
+    test("pni-only insert") {
       val id = process(null, PNI_A, null)
       expect(null, PNI_A, null)
 
@@ -102,18 +87,27 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
 
     test("e164+pni insert") {
-      process(E164_A, PNI_A, null)
+      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") {
-      process(E164_A, null, ACI_A)
+      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") {
-      process(E164_A, PNI_A, ACI_A)
+      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)
     }
   }
 
@@ -124,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") {
@@ -134,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)
@@ -143,6 +142,30 @@ class RecipientTableTest_getAndPossiblyMerge {
       process(null, null, null)
     }
 
+    test("pni matches, pni+aci provided, no pni session") {
+      given(E164_A, PNI_A, null)
+      process(null, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
+    test("pni matches, pni+aci provided, pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(null, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("pni matches, pni+aci provided, pni session, pni-verified") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(null, PNI_A, ACI_A, pniVerified = true)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
     test("no match, all fields") {
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
@@ -410,7 +433,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)
 
@@ -423,6 +446,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)
@@ -435,6 +468,76 @@ 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("steal, e164+pni+aci * pni+aci, all provided, aci sessions but not pni sessions, no SSE expected") {
+      given(E164_A, PNI_A, ACI_A, createThread = true, aciSession = true, pniSession = false)
+      given(null, PNI_B, ACI_B, createThread = false, aciSession = true, pniSession = false)
+
+      process(E164_A, PNI_B, ACI_A)
+
+      expect(E164_A, PNI_B, ACI_A)
+      expect(null, null, ACI_B)
+
+      expectNoSessionSwitchoverEvent()
+    }
+
     test("merge, e164 & pni & aci, all provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -690,6 +793,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)
+    }
   }
 
   /**
@@ -706,9 +825,9 @@ class RecipientTableTest_getAndPossiblyMerge {
     val smsId2: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
     val smsId3: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
 
-    val mmsId1: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
+    val mmsId1: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
+    val mmsId2: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
+    val mmsId3: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
 
     val threadIdAci: Long = SignalDatabase.threads.getThreadIdFor(recipientIdAci)!!
     val threadIdE164: Long = SignalDatabase.threads.getThreadIdFor(recipientIdE164)!!
@@ -828,12 +947,30 @@ class RecipientTableTest_getAndPossiblyMerge {
     MatcherAssert.assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
   }
 
-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
-    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
+  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
+    return IncomingMessage(
+      type = MessageType.NORMAL,
+      from = sender,
+      sentTimeMillis = time,
+      serverTimeMillis = time,
+      receivedTimeMillis = time,
+      body = body,
+      groupId = groupId.orNull(),
+      isUnidentified = true
+    )
   }
 
-  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
-    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty(), false, false)
+  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
+    return IncomingMessage(
+      type = MessageType.NORMAL,
+      from = sender,
+      groupId = groupId.orNull(),
+      body = body,
+      sentTimeMillis = time,
+      receivedTimeMillis = time,
+      serverTimeMillis = time,
+      isUnidentified = true
+    )
   }
 
   private fun identityKey(value: Byte): IdentityKey {
@@ -942,7 +1079,8 @@ 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
@@ -960,6 +1098,14 @@ 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(),
@@ -1136,7 +1282,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          ThreadMergeEvent.parseFrom(bytes)
+          ThreadMergeEvent.ADAPTER.decode(bytes)
         } else {
           null
         }
@@ -1154,7 +1300,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          SessionSwitchoverEvent.parseFrom(bytes)
+          SessionSwitchoverEvent.ADAPTER.decode(bytes)
         } else {
           null
         }

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

@@ -18,12 +18,10 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.groupChange
 import org.thoughtcrime.securesms.database.model.databaseprotos.groupContext
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage
-import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.Optional
 import java.util.UUID
 
 @Suppress("ClassName", "TestFunctionName")
@@ -272,13 +270,28 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
     assertThat("latest message should be deleted", sms.getMessageRecordOrNull(latestMessage.messageId), nullValue())
   }
 
-  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingTextMessage {
+  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingMessage {
     wallClock++
-    return IncomingTextMessage(sender, 1, wallClock, wallClock, wallClock, body, Optional.of(groupId), 0, true, null)
+    return IncomingMessage(
+      type = MessageType.NORMAL,
+      from = sender,
+      sentTimeMillis = wallClock,
+      serverTimeMillis = wallClock,
+      receivedTimeMillis = wallClock,
+      body = body,
+      groupId = groupId,
+      isUnidentified = true
+    )
   }
 
-  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingGroupUpdateMessage {
-    return IncomingGroupUpdateMessage(smsMessage(sender, null), groupContext)
+  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingMessage {
+    wallClock++
+    return IncomingMessage.groupUpdate(
+      from = sender,
+      timestamp = wallClock,
+      groupId = groupId,
+      groupContext = groupContext
+    )
   }
 
   companion object {

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

@@ -13,9 +13,9 @@ import okio.ByteString
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.KbsEnclave
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.push.SignalServiceTrustStore
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
@@ -23,32 +23,25 @@ import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
 import org.thoughtcrime.securesms.testing.success
-import org.thoughtcrime.securesms.util.Base64
-import org.whispersystems.signalservice.api.KeyBackupService
-import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.push.TrustStore
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl
 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
 
 /**
  * Dependency provider used for instrumentation tests (aka androidTests).
  *
- * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess] and
- * [KeyBackupService].
+ * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess].
  */
 class InstrumentationApplicationDependencyProvider(application: Application, default: ApplicationDependencyProvider) : ApplicationDependencies.Provider by default {
 
   private val serviceTrustStore: TrustStore
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
-  private val keyBackupService: KeyBackupService
   private val recipientCache: LiveRecipientCache
 
   init {
@@ -80,7 +73,6 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
         0 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
         2 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT))
       ),
-      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)),
@@ -97,8 +89,6 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
       on { uncensoredConfiguration } doReturn uncensoredConfiguration
     }
 
-    keyBackupService = mock()
-
     recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
@@ -106,10 +96,6 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     return serviceNetworkAccessMock
   }
 
-  override fun provideKeyBackupService(signalServiceAccountManager: SignalServiceAccountManager, keyStore: KeyStore, enclave: KbsEnclave): KeyBackupService {
-    return keyBackupService
-  }
-
   override fun provideRecipientCache(): LiveRecipientCache {
     return recipientCache
   }

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import android.net.Uri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.StreamUtil
+import org.thoughtcrime.securesms.attachments.UriAttachment
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.UriAttachmentBuilder
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.util.MediaUtil
+import java.util.Optional
+import java.util.concurrent.CountDownLatch
+
+@RunWith(AndroidJUnit4::class)
+class AttachmentCompressionJobTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun testCompressionJobsWithDifferentTransformPropertiesCompleteSuccessfully() {
+    val imageBytes: ByteArray = InstrumentationRegistry.getInstrumentation().context.resources.assets.open("images/sample_image.png").use {
+      StreamUtil.readFully(it)
+    }
+
+    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(ApplicationDependencies.getApplication())
+
+    val firstPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
+    val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)
+
+    val firstCompressionJob: AttachmentCompressionJob = AttachmentCompressionJob.fromAttachment(firstDatabaseAttachment, false, -1)
+
+    var secondCompressionJob: AttachmentCompressionJob? = null
+    var firstJobResult: Job.Result? = null
+    var secondJobResult: Job.Result? = null
+
+    val secondJobLatch = CountDownLatch(1)
+    val jobThread = Thread {
+      firstCompressionJob.setContext(ApplicationDependencies.getApplication())
+      firstJobResult = firstCompressionJob.run()
+
+      secondJobLatch.await()
+
+      secondCompressionJob!!.setContext(ApplicationDependencies.getApplication())
+      secondJobResult = secondCompressionJob!!.run()
+    }
+
+    jobThread.start()
+    val secondPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
+    val secondDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondPreUpload)
+    secondCompressionJob = AttachmentCompressionJob.fromAttachment(secondDatabaseAttachment, false, -1)
+
+    secondJobLatch.countDown()
+
+    jobThread.join()
+
+    firstJobResult!!.isSuccess assertIs true
+    secondJobResult!!.isSuccess assertIs true
+  }
+
+  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
+    return UriAttachmentBuilder.build(
+      id,
+      uri = uri,
+      contentType = MediaUtil.IMAGE_JPEG,
+      transformProperties = transformProperties
+    )
+  }
+}

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

@@ -1,181 +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.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-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
-import org.thoughtcrime.securesms.testing.failure
-import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
-import org.whispersystems.signalservice.internal.push.WhoAmIResponse
-import org.whispersystems.util.Base64UrlSafe
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class RefreshOwnProfileJob__checkUsernameIsInSyncTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-    SignalStore.phoneNumberPrivacy().clearUsernameOutOfSync()
-  }
-
-  @Test
-  fun givenNoLocalUsername_whenICheckUsernameIsInSync_thenIExpectNoFailures() {
-    // GIVEN
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Delete("/v1/accounts/username_hash") { MockResponse().success() }
-    )
-
-    // WHEN
-    RefreshOwnProfileJob.checkUsernameIsInSync()
-  }
-
-  @Test
-  fun givenLocalUsernameDoesNotMatchServerUsername_whenICheckUsernameIsInSync_thenIExpectRetry() {
-    // GIVEN
-    var didReserve = false
-    var didConfirm = false
-    val username = "hello.32"
-    val serverUsername = "hello.3232"
-    SignalDatabase.recipients.setUsername(harness.self.id, username)
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/accounts/whoami") { r ->
-        MockResponse().success(
-          WhoAmIResponse().apply {
-            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(serverUsername))
-          }
-        )
-      },
-      Put("/v1/accounts/username_hash/reserve") { r ->
-        didReserve = true
-        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
-      },
-      Put("/v1/accounts/username_hash/confirm") { r ->
-        didConfirm = true
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    RefreshOwnProfileJob.checkUsernameIsInSync()
-
-    // THEN
-    assertTrue(didReserve)
-    assertTrue(didConfirm)
-    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
-  }
-
-  @Test
-  fun givenLocalAndNoServer_whenICheckUsernameIsInSync_thenIExpectRetry() {
-    // GIVEN
-    var didReserve = false
-    var didConfirm = false
-    val username = "hello.32"
-    SignalDatabase.recipients.setUsername(harness.self.id, username)
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/accounts/whoami") { r ->
-        MockResponse().success(WhoAmIResponse())
-      },
-      Put("/v1/accounts/username_hash/reserve") { r ->
-        didReserve = true
-        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
-      },
-      Put("/v1/accounts/username_hash/confirm") { r ->
-        didConfirm = true
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    RefreshOwnProfileJob.checkUsernameIsInSync()
-
-    // THEN
-    assertTrue(didReserve)
-    assertTrue(didConfirm)
-    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
-  }
-
-  @Test
-  fun givenLocalAndServerMatch_whenICheckUsernameIsInSync_thenIExpectNoRetry() {
-    // GIVEN
-    var didReserve = false
-    var didConfirm = false
-    val username = "hello.32"
-    SignalDatabase.recipients.setUsername(harness.self.id, username)
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/accounts/whoami") { r ->
-        MockResponse().success(
-          WhoAmIResponse().apply {
-            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))
-          }
-        )
-      },
-      Put("/v1/accounts/username_hash/reserve") { r ->
-        didReserve = true
-        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
-      },
-      Put("/v1/accounts/username_hash/confirm") { r ->
-        didConfirm = true
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    RefreshOwnProfileJob.checkUsernameIsInSync()
-
-    // THEN
-    assertFalse(didReserve)
-    assertFalse(didConfirm)
-    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
-  }
-
-  @Test
-  fun givenMismatchAndReservationFails_whenICheckUsernameIsInSync_thenIExpectNoConfirm() {
-    // GIVEN
-    var didReserve = false
-    var didConfirm = false
-    val username = "hello.32"
-    SignalDatabase.recipients.setUsername(harness.self.id, username)
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/accounts/whoami") { r ->
-        MockResponse().success(
-          WhoAmIResponse().apply {
-            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash("${username}23"))
-          }
-        )
-      },
-      Put("/v1/accounts/username_hash/reserve") { r ->
-        didReserve = true
-        MockResponse().failure(418)
-      },
-      Put("/v1/accounts/username_hash/confirm") { r ->
-        didConfirm = true
-        MockResponse().success()
-      }
-    )
-
-    // WHEN
-    RefreshOwnProfileJob.checkUsernameIsInSync()
-
-    // THEN
-    assertTrue(didReserve)
-    assertFalse(didConfirm)
-    assertTrue(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
-  }
-}

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

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

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().rawUuid).build(),
-        metadata = metadata(
-          address = address(uuid = messageSender.requireServiceId().rawUuid).build()
-        ).build()
-      ).apply {
-        content = content().apply {
-          dataMessage = dataMessage().apply {
-            injectDataMessage()
-          }.build()
-        }.build()
-      }.build()
-    }
-  }
-}

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()
-            .setAciBytes(harness.self.requireAci().toByteString())
-            .setJoinedAtRevision(0)
-            .setRole(Member.Role.DEFAULT)
-            .build(),
-          DecryptedMember.newBuilder()
-            .setAciBytes(sender.requireAci().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

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

@@ -6,7 +6,6 @@ import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
 import okio.ByteString
-import okio.ByteString.Companion.toByteString
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
@@ -26,9 +25,9 @@ import org.thoughtcrime.securesms.testing.Entry
 import org.thoughtcrime.securesms.testing.FakeClientHelpers
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.awaitFor
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
-import org.whispersystems.signalservice.internal.websocket.WebSocketProtos.WebSocketMessage
-import org.whispersystems.signalservice.internal.websocket.WebSocketProtos.WebSocketRequestMessage
+import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.websocket.WebSocketMessage
+import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
 import java.util.regex.Pattern
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.minutes
@@ -59,14 +58,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
@@ -93,7 +92,7 @@ class MessageProcessingPerformanceTest {
     val messageCount = 100
     val envelopes = generateInboundEnvelopes(bobClient, messageCount)
     val firstTimestamp = envelopes.first().timestamp
-    val lastTimestamp = envelopes.last().timestamp
+    val lastTimestamp = envelopes.last().timestamp ?: 0
 
     // Inject the envelopes into the websocket
     Thread {
@@ -107,7 +106,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()
@@ -126,7 +125,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
@@ -142,7 +141,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
@@ -157,7 +156,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)
@@ -179,32 +178,19 @@ class MessageProcessingPerformanceTest {
   }
 
   private fun webSocketTombstone(): ByteString {
-    return WebSocketMessage
-      .newBuilder()
-      .setRequest(
-        WebSocketRequestMessage.newBuilder()
-          .setVerb("PUT")
-          .setPath("/api/v1/queue/empty")
-      )
-      .build()
-      .toByteArray()
-      .toByteString()
+    return WebSocketMessage(request = WebSocketRequestMessage(verb = "PUT", path = "/api/v1/queue/empty")).encodeByteString()
   }
 
   private fun Envelope.toWebSocketPayload(): ByteString {
-    return WebSocketMessage
-      .newBuilder()
-      .setType(WebSocketMessage.Type.REQUEST)
-      .setRequest(
-        WebSocketRequestMessage.newBuilder()
-          .setVerb("PUT")
-          .setPath("/api/v1/message")
-          .setId(Random(System.currentTimeMillis()).nextLong())
-          .addHeaders("X-Signal-Timestamp: ${this.timestamp}")
-          .setBody(this.toByteString())
+    return WebSocketMessage(
+      type = WebSocketMessage.Type.REQUEST,
+      request = WebSocketRequestMessage(
+        verb = "PUT",
+        path = "/api/v1/message",
+        id = Random(System.currentTimeMillis()).nextLong(),
+        headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
+        body = this.encodeByteString()
       )
-      .build()
-      .toByteArray()
-      .toByteString()
+    ).encodeByteString()
   }
 }

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

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

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

@@ -5,11 +5,12 @@ 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
+import org.whispersystems.signalservice.internal.push.Content
+import org.whispersystems.signalservice.internal.push.Envelope
 
-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)
@@ -19,9 +20,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, localMetric: SignalLocalMetrics.MessageReceive?) {
-    Log.d(TAG, startTag(envelope.timestamp))
+  override fun process(envelope: Envelope, content: Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
+    Log.d(TAG, startTag(envelope.timestamp!!))
     super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
-    Log.d(TAG, endTag(envelope.timestamp))
+    Log.d(TAG, endTag(envelope.timestamp!!))
   }
 }

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

@@ -6,12 +6,12 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.signal.core.util.Base64
 import org.signal.core.util.update
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 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.ServiceId.ACI
@@ -38,15 +38,21 @@ class ContactRecordProcessorTest {
     val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
     setStorageId(originalId, STORAGE_ID_A)
 
-    val remote1 = buildRecord(STORAGE_ID_B) {
-      setAci(ACI_A.toString())
-      setUnregisteredAtTimestamp(100)
-    }
+    val remote1 = buildRecord(
+      STORAGE_ID_B,
+      ContactRecord(
+        aci = ACI_A.toString(),
+        unregisteredAtTimestamp = 100
+      )
+    )
 
-    val remote2 = buildRecord(STORAGE_ID_C) {
-      setPni(PNI_A.toString())
-      setE164(E164_A)
-    }
+    val remote2 = buildRecord(
+      STORAGE_ID_C,
+      ContactRecord(
+        pni = PNI_A.toString(),
+        e164 = E164_A
+      )
+    )
 
     // WHEN
     val subject = ContactRecordProcessor()
@@ -69,16 +75,22 @@ class ContactRecordProcessorTest {
     val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
     setStorageId(originalId, STORAGE_ID_A)
 
-    val remote1 = buildRecord(STORAGE_ID_B) {
-      setAci(ACI_A.toString())
-      setUnregisteredAtTimestamp(0)
-    }
+    val remote1 = buildRecord(
+      STORAGE_ID_B,
+      ContactRecord(
+        aci = ACI_A.toString(),
+        unregisteredAtTimestamp = 0
+      )
+    )
 
-    val remote2 = buildRecord(STORAGE_ID_C) {
-      setAci(PNI_A.toString())
-      setPni(PNI_A.toString())
-      setE164(E164_A)
-    }
+    val remote2 = buildRecord(
+      STORAGE_ID_C,
+      ContactRecord(
+        aci = PNI_A.toString(),
+        pni = PNI_A.toString(),
+        e164 = E164_A
+      )
+    )
 
     // WHEN
     val subject = ContactRecordProcessor()
@@ -94,14 +106,14 @@ class ContactRecordProcessorTest {
     assertEquals(byAci, byE164)
   }
 
-  private fun buildRecord(id: StorageId, applyParams: ContactRecord.Builder.() -> ContactRecord.Builder): SignalContactRecord {
-    return SignalContactRecord(id, ContactRecord.getDefaultInstance().toBuilder().applyParams().build())
+  private fun buildRecord(id: StorageId, record: ContactRecord): SignalContactRecord {
+    return SignalContactRecord(id, record)
   }
 
   private fun setStorageId(recipientId: RecipientId, storageId: StorageId) {
     SignalDatabase.rawDatabase
       .update(RecipientTable.TABLE_NAME)
-      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeBytes(storageId.raw))
+      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeWithPadding(storageId.raw))
       .where("${RecipientTable.ID} = ?", recipientId)
       .run()
   }

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

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

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

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

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

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

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

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

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

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

@@ -1,22 +1,12 @@
 package org.thoughtcrime.securesms.testing
 
-import org.mockito.kotlin.anyOrNull
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.stub
-import org.signal.core.util.Hex
 import org.signal.libsignal.protocol.IdentityKeyPair
 import org.signal.libsignal.protocol.ecc.Curve
 import org.signal.libsignal.protocol.state.PreKeyRecord
 import org.signal.libsignal.protocol.util.KeyHelper
 import org.signal.libsignal.protocol.util.Medium
-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.test.BuildConfig
-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
@@ -78,18 +68,6 @@ object MockProvider {
     }
   }
 
-  fun mockGetRegistrationLockStringFlow() {
-    val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {
-      override fun hashSalt(): ByteArray = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8")
-      override fun restorePin(hashedPin: PinHash?): SvrPinData = SvrPinData(MasterKey.createNew(SecureRandom()), null)
-    }
-
-    val kbsService = ApplicationDependencies.getKeyBackupService(BuildConfig.KBS_ENCLAVE)
-    kbsService.stub {
-      on { newRegistrationSession(anyOrNull(), anyOrNull()) } doReturn session
-    }
-  }
-
   fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account().aciIdentityKey, deviceId: Int): PreKeyResponse {
     val signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), identity.privateKey)
     val oneTimePreKey = PreKeyRecord(SecureRandom().nextInt(Medium.MAX_VALUE), Curve.generateKeyPair())

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

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

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

@@ -1,11 +1,19 @@
 package org.thoughtcrime.securesms.testing
 
+import android.database.Cursor
+import android.util.Base64
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
+import org.signal.core.util.logging.Log
+import org.signal.core.util.readToList
+import org.signal.core.util.select
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.util.MessageTableTestUtils
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
@@ -53,3 +61,29 @@ fun CountDownLatch.awaitFor(duration: Duration) {
     throw TimeoutException("Latch await took longer than ${duration.inWholeMilliseconds}ms")
   }
 }
+
+fun dumpTableToLogs(tag: String = "TestUtils", table: String) {
+  dumpTable(table).forEach { Log.d(tag, it.toString()) }
+}
+
+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
+    }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/util/MessageTableTestUtils.kt

@@ -38,10 +38,8 @@ object MessageTableTestUtils {
       isKeyExchangeType:${type and MessageTypes.KEY_EXCHANGE_BIT != 0L}
       isIdentityVerified:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT != 0L}
       isIdentityDefault:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT != 0L}
-      isCorruptedKeyExchange:${type and MessageTypes.KEY_EXCHANGE_CORRUPTED_BIT != 0L}
       isInvalidVersionKeyExchange:${type and MessageTypes.KEY_EXCHANGE_INVALID_VERSION_BIT != 0L}
       isBundleKeyExchange:${type and MessageTypes.KEY_EXCHANGE_BUNDLE_BIT != 0L}
-      isContentBundleKeyExchange:${type and MessageTypes.KEY_EXCHANGE_CONTENT_FORMAT != 0L}
       isIdentityUpdate:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT != 0L}
       isRateLimited:${type and MessageTypes.MESSAGE_RATE_LIMITED_BIT != 0L}
       isExpirationTimerUpdate:${type and MessageTypes.EXPIRATION_TIMER_UPDATE_BIT != 0L}

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

@@ -2,9 +2,10 @@ package org.signal.benchmark.setup
 
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.TestDbUtils
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -65,7 +66,8 @@ object TestMessages {
     return insert
   }
   fun insertIncomingTextMessage(other: Recipient, body: String, timestamp: Long? = null) {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -73,10 +75,11 @@ object TestMessages {
       receivedTimeMillis = timestamp ?: System.currentTimeMillis()
     )
 
-    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
+    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
   }
   fun insertIncomingQuoteTextMessage(other: Recipient, body: String, quote: QuoteModel, timestamp: Long?) {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -90,28 +93,30 @@ object TestMessages {
     val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
       imageAttachment()
     }
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
       serverTimeMillis = timestamp ?: System.currentTimeMillis(),
       receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
-    return insertIncomingMediaMessage(recipient = other, message = message, failed = failed)
+    return insertIncomingMessage(recipient = other, message = message, failed = failed)
   }
 
   fun insertIncomingVoiceMessage(other: Recipient, timestamp: Long? = null): Long {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
       serverTimeMillis = timestamp ?: System.currentTimeMillis(),
       receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
       attachments = PointerAttachment.forPointers(Optional.of(Collections.singletonList(voiceAttachment()) as List<SignalServiceAttachment>))
     )
-    return insertIncomingMediaMessage(recipient = other, message = message, failed = false)
+    return insertIncomingMessage(recipient = other, message = message, failed = false)
   }
 
-  private fun insertIncomingMediaMessage(recipient: Recipient, message: IncomingMediaMessage, failed: Boolean = false): Long {
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage, failed: Boolean = false): Long {
     val id = insertIncomingMessage(recipient = recipient, message = message)
     if (failed) {
       setMessageMediaFailed(id)
@@ -122,8 +127,8 @@ object TestMessages {
     return id
   }
 
-  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMediaMessage): Long {
-    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage): Long {
+    return SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
   }
 
   private fun setMessageMediaFailed(messageId: Long) {
@@ -149,6 +154,7 @@ object TestMessages {
       1024,
       Optional.empty(),
       Optional.empty(),
+      0,
       Optional.of("/not-there.jpg"),
       false,
       false,
@@ -171,6 +177,7 @@ object TestMessages {
       1024,
       Optional.empty(),
       Optional.empty(),
+      0,
       Optional.of("/not-there.aac"),
       true,
       false,

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

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey
 import org.thoughtcrime.securesms.conversation.v2.data.IncomingTextOnly
 import org.thoughtcrime.securesms.conversation.v2.data.OutgoingTextOnly
 import org.thoughtcrime.securesms.database.MessageTypes
-import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.mms.SlideDeck
@@ -78,7 +78,7 @@ class ConversationElementGenerator {
 
     val isIncoming = random.nextBoolean()
 
-    val record = MediaMmsMessageRecord(
+    val record = MmsMessageRecord(
       messageId,
       if (isIncoming) Recipient.UNKNOWN else Recipient.self(),
       0,
@@ -86,7 +86,7 @@ class ConversationElementGenerator {
       now,
       now,
       now,
-      1,
+      true,
       1,
       testMessage,
       SlideDeck(),
@@ -97,7 +97,7 @@ class ConversationElementGenerator {
       0,
       0,
       false,
-      1,
+      true,
       null,
       emptyList(),
       emptyList(),
@@ -106,7 +106,7 @@ class ConversationElementGenerator {
       false,
       false,
       now,
-      1,
+      true,
       now,
       null,
       StoryType.NONE,

app/src/main/AndroidManifest.xml

@@ -44,6 +44,8 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" android:usesPermissionFlags="neverForLocation" />
+
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CALL_STATE"/>
@@ -94,6 +96,10 @@
 
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
     <application android:name=".ApplicationContext"
                  android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
@@ -246,6 +252,7 @@
 
     <activity-alias android:name=".RoutingActivity"
                     android:targetActivity=".MainActivity"
+                    android:resizeableActivity="true"
                     android:exported="true">
 
         <intent-filter>
@@ -624,6 +631,7 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:parentActivityName=".MainActivity"
+              android:resizeableActivity="true"
               android:exported="false">
         <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -955,7 +963,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.edit.EditProfileActivity"
+    <activity android:name=".profiles.edit.CreateProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
@@ -965,7 +973,7 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.manage.ManageProfileActivity"
+    <activity android:name=".profiles.manage.EditProfileActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
@@ -1023,6 +1031,7 @@
     <activity android:name=".MainActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:resizeableActivity="true"
               android:exported="false"/>
 
     <activity android:name=".pin.PinRestoreActivity"
@@ -1134,9 +1143,11 @@
 
     <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>
 
@@ -1178,6 +1189,10 @@
         android:name=".service.GenericForegroundService"
         android:exported="false"/>
 
+    <service
+        android:name=".service.AttachmentProgressService"
+        android:exported="false"/>
+
     <service
         android:name=".gcm.FcmFetchBackgroundService"
         android:exported="false"/>
@@ -1192,18 +1207,6 @@
         </intent-filter>
     </service>
 
-    <receiver android:name=".service.SmsListener"
-              android:permission="android.permission.BROADCAST_SMS"
-              android:enabled="true"
-              android:exported="true">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
-             </intent-filter>
-    </receiver>
-
     <receiver android:name=".service.SmsDeliveryListener"
               android:exported="true">
         <intent-filter>
@@ -1211,20 +1214,6 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.MmsListener"
-              android:enabled="true"
-              android:exported="true"
-              android:permission="android.permission.BROADCAST_WAP_PUSH">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-    </receiver>
-
     <receiver android:name=".notifications.MarkReadReceiver"
               android:enabled="true"
               android:exported="false">
@@ -1323,7 +1312,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" />

app/src/main/java/org/conscrypt/ConscryptSignal.java

@@ -0,0 +1,800 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.conscrypt;
+
+import java.nio.ByteBuffer;
+import java.security.KeyManagementException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLContextSpi;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * Core API for creating and configuring all Conscrypt types.
+ * This is identical to the original Conscrypt.java, except with the slow
+ * version initialization code removed.
+ */
+@SuppressWarnings("unused")
+public final class ConscryptSignal {
+  private ConscryptSignal() {}
+
+  /**
+   * Returns {@code true} if the Conscrypt native library has been successfully loaded.
+   */
+  public static boolean isAvailable() {
+    try {
+      checkAvailability();
+      return true;
+    } catch (Throwable e) {
+      return false;
+    }
+  }
+
+  // BEGIN MODIFICATION
+  /*public static class Version {
+    private final int major;
+    private final int minor;
+    private final int patch;
+
+    private Version(int major, int minor, int patch) {
+      this.major = major;
+      this.minor = minor;
+      this.patch = patch;
+    }
+
+    public int major() { return major; }
+    public int minor() { return minor; }
+    public int patch() { return patch; }
+  }
+
+  private static final Version VERSION;
+
+  static {
+    int major = -1;
+    int minor = -1;
+    int patch = -1;
+    InputStream stream = null;
+    try {
+      stream = Conscrypt.class.getResourceAsStream("conscrypt.properties");
+      if (stream != null) {
+        Properties props = new Properties();
+        props.load(stream);
+        major = Integer.parseInt(props.getProperty("org.conscrypt.version.major", "-1"));
+        minor = Integer.parseInt(props.getProperty("org.conscrypt.version.minor", "-1"));
+        patch = Integer.parseInt(props.getProperty("org.conscrypt.version.patch", "-1"));
+      }
+    } catch (IOException e) {
+      // TODO(prb): This should probably be fatal or have some fallback behaviour
+    } finally {
+      IoUtils.closeQuietly(stream);
+    }
+    if ((major >= 0) && (minor >= 0) && (patch >= 0)) {
+      VERSION = new Version(major, minor, patch);
+    } else {
+      VERSION = null;
+    }
+  }
+
+  /**
+   * Returns the version of this distribution of Conscrypt.  If version information is
+   * unavailable, returns {@code null}.
+   */
+  /*public static Version version() {
+    return VERSION;
+  }*/
+
+  // END MODIFICATION
+
+  /**
+   * Checks that the Conscrypt support is available for the system.
+   *
+   * @throws UnsatisfiedLinkError if unavailable
+   */
+  public static void checkAvailability() {
+    NativeCrypto.checkAvailability();
+  }
+
+  /**
+   * Indicates whether the given {@link Provider} was created by this distribution of Conscrypt.
+   */
+  public static boolean isConscrypt(Provider provider) {
+    return provider instanceof OpenSSLProvider;
+  }
+
+  /**
+   * Constructs a new {@link Provider} with the default name.
+   */
+  public static Provider newProvider() {
+    checkAvailability();
+    return new OpenSSLProvider();
+  }
+
+  /**
+   * Constructs a new {@link Provider} with the given name.
+   *
+   * @deprecated Use {@link #newProviderBuilder()} instead.
+   */
+  @Deprecated
+  public static Provider newProvider(String providerName) {
+    checkAvailability();
+    return newProviderBuilder().setName(providerName).build();
+  }
+
+  public static class ProviderBuilder {
+    private String name = Platform.getDefaultProviderName();
+    private boolean provideTrustManager = Platform.provideTrustManagerByDefault();
+    private String defaultTlsProtocol = NativeCrypto.SUPPORTED_PROTOCOL_TLSV1_3;
+
+    private ProviderBuilder() {}
+
+    /**
+     * Sets the name of the Provider to be built.
+     */
+    public ProviderBuilder setName(String name) {
+      this.name = name;
+      return this;
+    }
+
+    /**
+     * Causes the returned provider to provide an implementation of
+     * {@link javax.net.ssl.TrustManagerFactory}.
+     * @deprecated Use provideTrustManager(true)
+     */
+    @Deprecated
+    public ProviderBuilder provideTrustManager() {
+      return provideTrustManager(true);
+    }
+
+    /**
+     * Specifies whether the returned provider will provide an implementation of
+     * {@link javax.net.ssl.TrustManagerFactory}.
+     */
+    public ProviderBuilder provideTrustManager(boolean provide) {
+      this.provideTrustManager = provide;
+      return this;
+    }
+
+    /**
+     * Specifies what the default TLS protocol should be for SSLContext identifiers
+     * {@code TLS}, {@code SSL}, and {@code Default}.
+     */
+    public ProviderBuilder defaultTlsProtocol(String defaultTlsProtocol) {
+      this.defaultTlsProtocol = defaultTlsProtocol;
+      return this;
+    }
+
+    public Provider build() {
+      return new OpenSSLProvider(name, provideTrustManager, defaultTlsProtocol);
+    }
+  }
+
+  public static ProviderBuilder newProviderBuilder() {
+    return new ProviderBuilder();
+  }
+
+  /**
+   * Returns the maximum length (in bytes) of an encrypted packet.
+   */
+  public static int maxEncryptedPacketLength() {
+    return NativeConstants.SSL3_RT_MAX_PACKET_SIZE;
+  }
+
+  /**
+   * Gets the default X.509 trust manager.
+   */
+  @ExperimentalApi
+  public static X509TrustManager getDefaultX509TrustManager() throws KeyManagementException {
+    checkAvailability();
+    return SSLParametersImpl.getDefaultX509TrustManager();
+  }
+
+  /**
+   * Indicates whether the given {@link SSLContext} was created by this distribution of Conscrypt.
+   */
+  public static boolean isConscrypt(SSLContext context) {
+    return context.getProvider() instanceof OpenSSLProvider;
+  }
+
+  /**
+   * Constructs a new instance of the preferred {@link SSLContextSpi}.
+   */
+  public static SSLContextSpi newPreferredSSLContextSpi() {
+    checkAvailability();
+    return OpenSSLContextImpl.getPreferred();
+  }
+
+  /**
+   * Sets the client-side persistent cache to be used by the context.
+   */
+  public static void setClientSessionCache(SSLContext context, SSLClientSessionCache cache) {
+    SSLSessionContext clientContext = context.getClientSessionContext();
+    if (!(clientContext instanceof ClientSessionContext)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt client context: " + clientContext.getClass().getName());
+    }
+    ((ClientSessionContext) clientContext).setPersistentCache(cache);
+  }
+
+  /**
+   * Sets the server-side persistent cache to be used by the context.
+   */
+  public static void setServerSessionCache(SSLContext context, SSLServerSessionCache cache) {
+    SSLSessionContext serverContext = context.getServerSessionContext();
+    if (!(serverContext instanceof ServerSessionContext)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt client context: " + serverContext.getClass().getName());
+    }
+    ((ServerSessionContext) serverContext).setPersistentCache(cache);
+  }
+
+  /**
+   * Indicates whether the given {@link SSLSocketFactory} was created by this distribution of
+   * Conscrypt.
+   */
+  public static boolean isConscrypt(SSLSocketFactory factory) {
+    return factory instanceof OpenSSLSocketFactoryImpl;
+  }
+
+  private static OpenSSLSocketFactoryImpl toConscrypt(SSLSocketFactory factory) {
+    if (!isConscrypt(factory)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt socket factory: " + factory.getClass().getName());
+    }
+    return (OpenSSLSocketFactoryImpl) factory;
+  }
+
+  /**
+   * Configures the default socket to be created for all socket factory instances.
+   */
+  @ExperimentalApi
+  public static void setUseEngineSocketByDefault(boolean useEngineSocket) {
+    OpenSSLSocketFactoryImpl.setUseEngineSocketByDefault(useEngineSocket);
+    OpenSSLServerSocketFactoryImpl.setUseEngineSocketByDefault(useEngineSocket);
+  }
+
+  /**
+   * Configures the socket to be created for the given socket factory instance.
+   */
+  @ExperimentalApi
+  public static void setUseEngineSocket(SSLSocketFactory factory, boolean useEngineSocket) {
+    toConscrypt(factory).setUseEngineSocket(useEngineSocket);
+  }
+
+  /**
+   * Indicates whether the given {@link SSLServerSocketFactory} was created by this distribution
+   * of Conscrypt.
+   */
+  public static boolean isConscrypt(SSLServerSocketFactory factory) {
+    return factory instanceof OpenSSLServerSocketFactoryImpl;
+  }
+
+  private static OpenSSLServerSocketFactoryImpl toConscrypt(SSLServerSocketFactory factory) {
+    if (!isConscrypt(factory)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt server socket factory: " + factory.getClass().getName());
+    }
+    return (OpenSSLServerSocketFactoryImpl) factory;
+  }
+
+  /**
+   * Configures the socket to be created for the given server socket factory instance.
+   */
+  @ExperimentalApi
+  public static void setUseEngineSocket(SSLServerSocketFactory factory, boolean useEngineSocket) {
+    toConscrypt(factory).setUseEngineSocket(useEngineSocket);
+  }
+
+  /**
+   * Indicates whether the given {@link SSLSocket} was created by this distribution of Conscrypt.
+   */
+  public static boolean isConscrypt(SSLSocket socket) {
+    return socket instanceof AbstractConscryptSocket;
+  }
+
+  private static AbstractConscryptSocket toConscrypt(SSLSocket socket) {
+    if (!isConscrypt(socket)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt socket: " + socket.getClass().getName());
+    }
+    return (AbstractConscryptSocket) socket;
+  }
+
+  /**
+   * This method enables Server Name Indication (SNI) and overrides the hostname supplied
+   * during socket creation.  If the hostname is not a valid SNI hostname, the SNI extension
+   * will be omitted from the handshake.
+   *
+   * @param socket the socket
+   * @param hostname the desired SNI hostname, or null to disable
+   */
+  public static void setHostname(SSLSocket socket, String hostname) {
+    toConscrypt(socket).setHostname(hostname);
+  }
+
+  /**
+   * Returns either the hostname supplied during socket creation or via
+   * {@link #setHostname(SSLSocket, String)}. No DNS resolution is attempted before
+   * returning the hostname.
+   */
+  public static String getHostname(SSLSocket socket) {
+    return toConscrypt(socket).getHostname();
+  }
+
+  /**
+   * This method attempts to create a textual representation of the peer host or IP. Does
+   * not perform a reverse DNS lookup. This is typically used during session creation.
+   */
+  public static String getHostnameOrIP(SSLSocket socket) {
+    return toConscrypt(socket).getHostnameOrIP();
+  }
+
+  /**
+   * This method enables session ticket support.
+   *
+   * @param socket the socket
+   * @param useSessionTickets True to enable session tickets
+   */
+  public static void setUseSessionTickets(SSLSocket socket, boolean useSessionTickets) {
+    toConscrypt(socket).setUseSessionTickets(useSessionTickets);
+  }
+
+  /**
+   * Enables/disables TLS Channel ID for the given server-side socket.
+   *
+   * <p>This method needs to be invoked before the handshake starts.
+   *
+   * @param socket the socket
+   * @param enabled Whether to enable channel ID.
+   * @throws IllegalStateException if this is a client socket or if the handshake has already
+   * started.
+   */
+  public static void setChannelIdEnabled(SSLSocket socket, boolean enabled) {
+    toConscrypt(socket).setChannelIdEnabled(enabled);
+  }
+
+  /**
+   * Gets the TLS Channel ID for the given server-side socket. Channel ID is only available
+   * once the handshake completes.
+   *
+   * @param socket the socket
+   * @return channel ID or {@code null} if not available.
+   * @throws IllegalStateException if this is a client socket or if the handshake has not yet
+   * completed.
+   * @throws SSLException if channel ID is available but could not be obtained.
+   */
+  public static byte[] getChannelId(SSLSocket socket) throws SSLException {
+    return toConscrypt(socket).getChannelId();
+  }
+
+  /**
+   * Sets the {@link PrivateKey} to be used for TLS Channel ID by this client socket.
+   *
+   * <p>This method needs to be invoked before the handshake starts.
+   *
+   * @param socket the socket
+   * @param privateKey private key (enables TLS Channel ID) or {@code null} for no key
+   * (disables TLS Channel ID).
+   * The private key must be an Elliptic Curve (EC) key based on the NIST P-256 curve (aka
+   * SECG secp256r1 or ANSI
+   * X9.62 prime256v1).
+   * @throws IllegalStateException if this is a server socket or if the handshake has already
+   * started.
+   */
+  public static void setChannelIdPrivateKey(SSLSocket socket, PrivateKey privateKey) {
+    toConscrypt(socket).setChannelIdPrivateKey(privateKey);
+  }
+
+  /**
+   * Returns the ALPN protocol agreed upon by client and server.
+   *
+   * @param socket the socket
+   * @return the selected protocol or {@code null} if no protocol was agreed upon.
+   */
+  public static String getApplicationProtocol(SSLSocket socket) {
+    return toConscrypt(socket).getApplicationProtocol();
+  }
+
+  /**
+   * Sets an application-provided ALPN protocol selector. If provided, this will override
+   * the list of protocols set by {@link #setApplicationProtocols(SSLSocket, String[])}.
+   *
+   * @param socket the socket
+   * @param selector the ALPN protocol selector
+   */
+  public static void setApplicationProtocolSelector(SSLSocket socket,
+                                                    ApplicationProtocolSelector selector) {
+    toConscrypt(socket).setApplicationProtocolSelector(selector);
+  }
+
+  /**
+   * Sets the application-layer protocols (ALPN) in prioritization order.
+   *
+   * @param socket the socket being configured
+   * @param protocols the protocols in descending order of preference. If empty, no protocol
+   * indications will be used. This array will be copied.
+   * @throws IllegalArgumentException - if protocols is null, or if any element in a non-empty
+   * array is null or an empty (zero-length) string
+   */
+  public static void setApplicationProtocols(SSLSocket socket, String[] protocols) {
+    toConscrypt(socket).setApplicationProtocols(protocols);
+  }
+
+  /**
+   * Gets the application-layer protocols (ALPN) in prioritization order.
+   *
+   * @param socket the socket
+   * @return the protocols in descending order of preference, or an empty array if protocol
+   * indications are not being used. Always returns a new array.
+   */
+  public static String[] getApplicationProtocols(SSLSocket socket) {
+    return toConscrypt(socket).getApplicationProtocols();
+  }
+
+  /**
+   * Returns the tls-unique channel binding value for this connection, per RFC 5929.  This
+   * will return {@code null} if there is no such value available, such as if the handshake
+   * has not yet completed or this connection is closed.
+   */
+  public static byte[] getTlsUnique(SSLSocket socket) {
+    return toConscrypt(socket).getTlsUnique();
+  }
+
+  /**
+   * Exports a value derived from the TLS master secret as described in RFC 5705.
+   *
+   * @param label the label to use in calculating the exported value.  This must be
+   * an ASCII-only string.
+   * @param context the application-specific context value to use in calculating the
+   * exported value.  This may be {@code null} to use no application context, which is
+   * treated differently than an empty byte array.
+   * @param length the number of bytes of keying material to return.
+   * @return a value of the specified length, or {@code null} if the handshake has not yet
+   * completed or the connection has been closed.
+   * @throws SSLException if the value could not be exported.
+   */
+  public static byte[] exportKeyingMaterial(SSLSocket socket, String label, byte[] context,
+                                            int length) throws SSLException {
+    return toConscrypt(socket).exportKeyingMaterial(label, context, length);
+  }
+
+  /**
+   * Indicates whether the given {@link SSLEngine} was created by this distribution of Conscrypt.
+   */
+  public static boolean isConscrypt(SSLEngine engine) {
+    return engine instanceof AbstractConscryptEngine;
+  }
+
+  private static AbstractConscryptEngine toConscrypt(SSLEngine engine) {
+    if (!isConscrypt(engine)) {
+      throw new IllegalArgumentException(
+          "Not a conscrypt engine: " + engine.getClass().getName());
+    }
+    return (AbstractConscryptEngine) engine;
+  }
+
+  /**
+   * Provides the given engine with the provided bufferAllocator.
+   * @throws IllegalArgumentException if the provided engine is not a Conscrypt engine.
+   * @throws IllegalStateException if the provided engine has already begun its handshake.
+   */
+  @ExperimentalApi
+  public static void setBufferAllocator(SSLEngine engine, BufferAllocator bufferAllocator) {
+    toConscrypt(engine).setBufferAllocator(bufferAllocator);
+  }
+
+  /**
+   * Provides the given socket with the provided bufferAllocator.  If the given socket is a
+   * Conscrypt socket but does not use buffer allocators, this method does nothing.
+   * @throws IllegalArgumentException if the provided socket is not a Conscrypt socket.
+   * @throws IllegalStateException if the provided socket has already begun its handshake.
+   */
+  @ExperimentalApi
+  public static void setBufferAllocator(SSLSocket socket, BufferAllocator bufferAllocator) {
+    AbstractConscryptSocket s = toConscrypt(socket);
+    if (s instanceof ConscryptEngineSocket) {
+      ((ConscryptEngineSocket) s).setBufferAllocator(bufferAllocator);
+    }
+  }
+
+  /**
+   * Configures the default {@link BufferAllocator} to be used by all future
+   * {@link SSLEngine} instances from this provider.
+   */
+  @ExperimentalApi
+  public static void setDefaultBufferAllocator(BufferAllocator bufferAllocator) {
+    ConscryptEngine.setDefaultBufferAllocator(bufferAllocator);
+  }
+
+  /**
+   * This method enables Server Name Indication (SNI) and overrides the hostname supplied
+   * during engine creation.
+   *
+   * @param engine the engine
+   * @param hostname the desired SNI hostname, or {@code null} to disable
+   */
+  public static void setHostname(SSLEngine engine, String hostname) {
+    toConscrypt(engine).setHostname(hostname);
+  }
+
+  /**
+   * Returns either the hostname supplied during socket creation or via
+   * {@link #setHostname(SSLEngine, String)}. No DNS resolution is attempted before
+   * returning the hostname.
+   */
+  public static String getHostname(SSLEngine engine) {
+    return toConscrypt(engine).getHostname();
+  }
+
+  /**
+   * Returns the maximum overhead, in bytes, of sealing a record with SSL.
+   */
+  public static int maxSealOverhead(SSLEngine engine) {
+    return toConscrypt(engine).maxSealOverhead();
+  }
+
+  /**
+   * Sets a listener on the given engine for completion of the TLS handshake
+   */
+  public static void setHandshakeListener(SSLEngine engine, HandshakeListener handshakeListener) {
+    toConscrypt(engine).setHandshakeListener(handshakeListener);
+  }
+
+  /**
+   * Enables/disables TLS Channel ID for the given server-side engine.
+   *
+   * <p>This method needs to be invoked before the handshake starts.
+   *
+   * @param engine the engine
+   * @param enabled Whether to enable channel ID.
+   * @throws IllegalStateException if this is a client engine or if the handshake has already
+   * started.
+   */
+  public static void setChannelIdEnabled(SSLEngine engine, boolean enabled) {
+    toConscrypt(engine).setChannelIdEnabled(enabled);
+  }
+
+  /**
+   * Gets the TLS Channel ID for the given server-side engine. Channel ID is only available
+   * once the handshake completes.
+   *
+   * @param engine the engine
+   * @return channel ID or {@code null} if not available.
+   * @throws IllegalStateException if this is a client engine or if the handshake has not yet
+   * completed.
+   * @throws SSLException if channel ID is available but could not be obtained.
+   */
+  public static byte[] getChannelId(SSLEngine engine) throws SSLException {
+    return toConscrypt(engine).getChannelId();
+  }
+
+  /**
+   * Sets the {@link PrivateKey} to be used for TLS Channel ID by this client engine.
+   *
+   * <p>This method needs to be invoked before the handshake starts.
+   *
+   * @param engine the engine
+   * @param privateKey private key (enables TLS Channel ID) or {@code null} for no key
+   * (disables TLS Channel ID).
+   * The private key must be an Elliptic Curve (EC) key based on the NIST P-256 curve (aka
+   * SECG secp256r1 or ANSI X9.62 prime256v1).
+   * @throws IllegalStateException if this is a server engine or if the handshake has already
+   * started.
+   */
+  public static void setChannelIdPrivateKey(SSLEngine engine, PrivateKey privateKey) {
+    toConscrypt(engine).setChannelIdPrivateKey(privateKey);
+  }
+
+  /**
+   * Extended unwrap method for multiple source and destination buffers.
+   *
+   * @param engine the target engine for the unwrap
+   * @param srcs the source buffers
+   * @param dsts the destination buffers
+   * @return the result of the unwrap operation
+   * @throws SSLException thrown if an SSL error occurred
+   */
+  public static SSLEngineResult unwrap(SSLEngine engine, final ByteBuffer[] srcs,
+                                       final ByteBuffer[] dsts) throws SSLException {
+    return toConscrypt(engine).unwrap(srcs, dsts);
+  }
+
+  /**
+   * Exteneded unwrap method for multiple source and destination buffers.
+   *
+   * @param engine the target engine for the unwrap.
+   * @param srcs the source buffers
+   * @param srcsOffset the offset in the {@code srcs} array of the first source buffer
+   * @param srcsLength the number of source buffers starting at {@code srcsOffset}
+   * @param dsts the destination buffers
+   * @param dstsOffset the offset in the {@code dsts} array of the first destination buffer
+   * @param dstsLength the number of destination buffers starting at {@code dstsOffset}
+   * @return the result of the unwrap operation
+   * @throws SSLException thrown if an SSL error occurred
+   */
+  public static SSLEngineResult unwrap(SSLEngine engine, final ByteBuffer[] srcs, int srcsOffset,
+                                       final int srcsLength, final ByteBuffer[] dsts, final int dstsOffset,
+                                       final int dstsLength) throws SSLException {
+    return toConscrypt(engine).unwrap(
+        srcs, srcsOffset, srcsLength, dsts, dstsOffset, dstsLength);
+  }
+
+  /**
+   * This method enables session ticket support.
+   *
+   * @param engine the engine
+   * @param useSessionTickets True to enable session tickets
+   */
+  public static void setUseSessionTickets(SSLEngine engine, boolean useSessionTickets) {
+    toConscrypt(engine).setUseSessionTickets(useSessionTickets);
+  }
+
+  /**
+   * Sets the application-layer protocols (ALPN) in prioritization order.
+   *
+   * @param engine the engine being configured
+   * @param protocols the protocols in descending order of preference. If empty, no protocol
+   * indications will be used.  This array will be copied.
+   * @throws IllegalArgumentException - if protocols is null, or if any element in a non-empty
+   * array is null or an empty (zero-length) string
+   */
+  public static void setApplicationProtocols(SSLEngine engine, String[] protocols) {
+    toConscrypt(engine).setApplicationProtocols(protocols);
+  }
+
+  /**
+   * Gets the application-layer protocols (ALPN) in prioritization order.
+   *
+   * @param engine the engine
+   * @return the protocols in descending order of preference, or an empty array if protocol
+   * indications are not being used. Always returns a new array.
+   */
+  public static String[] getApplicationProtocols(SSLEngine engine) {
+    return toConscrypt(engine).getApplicationProtocols();
+  }
+
+  /**
+   * Sets an application-provided ALPN protocol selector. If provided, this will override
+   * the list of protocols set by {@link #setApplicationProtocols(SSLEngine, String[])}.
+   *
+   * @param engine the engine
+   * @param selector the ALPN protocol selector
+   */
+  public static void setApplicationProtocolSelector(SSLEngine engine,
+                                                    ApplicationProtocolSelector selector) {
+    toConscrypt(engine).setApplicationProtocolSelector(selector);
+  }
+
+  /**
+   * Returns the ALPN protocol agreed upon by client and server.
+   *
+   * @param engine the engine
+   * @return the selected protocol or {@code null} if no protocol was agreed upon.
+   */
+  public static String getApplicationProtocol(SSLEngine engine) {
+    return toConscrypt(engine).getApplicationProtocol();
+  }
+
+  /**
+   * Returns the tls-unique channel binding value for this connection, per RFC 5929.  This
+   * will return {@code null} if there is no such value available, such as if the handshake
+   * has not yet completed or this connection is closed.
+   */
+  public static byte[] getTlsUnique(SSLEngine engine) {
+    return toConscrypt(engine).getTlsUnique();
+  }
+
+  /**
+   * Exports a value derived from the TLS master secret as described in RFC 5705.
+   *
+   * @param label the label to use in calculating the exported value.  This must be
+   * an ASCII-only string.
+   * @param context the application-specific context value to use in calculating the
+   * exported value.  This may be {@code null} to use no application context, which is
+   * treated differently than an empty byte array.
+   * @param length the number of bytes of keying material to return.
+   * @return a value of the specified length, or {@code null} if the handshake has not yet
+   * completed or the connection has been closed.
+   * @throws SSLException if the value could not be exported.
+   */
+  public static byte[] exportKeyingMaterial(SSLEngine engine, String label, byte[] context,
+                                            int length) throws SSLException {
+    return toConscrypt(engine).exportKeyingMaterial(label, context, length);
+  }
+
+  /**
+   * Indicates whether the given {@link TrustManager} was created by this distribution of
+   * Conscrypt.
+   */
+  public static boolean isConscrypt(TrustManager trustManager) {
+    return trustManager instanceof TrustManagerImpl;
+  }
+
+  private static TrustManagerImpl toConscrypt(TrustManager trustManager) {
+    if (!isConscrypt(trustManager)) {
+      throw new IllegalArgumentException(
+          "Not a Conscrypt trust manager: " + trustManager.getClass().getName());
+    }
+    return (TrustManagerImpl) trustManager;
+  }
+
+  /**
+   * Set the default hostname verifier that will be used for HTTPS endpoint identification by
+   * Conscrypt trust managers.  If {@code null} (the default), endpoint identification will use
+   * the default hostname verifier set in
+   * {@link HttpsURLConnection#setDefaultHostnameVerifier(javax.net.ssl.HostnameVerifier)}.
+   */
+  public synchronized static void setDefaultHostnameVerifier(ConscryptHostnameVerifier verifier) {
+    TrustManagerImpl.setDefaultHostnameVerifier(verifier);
+  }
+
+  /**
+   * Returns the currently-set default hostname verifier for Conscrypt trust managers.
+   *
+   * @see #setDefaultHostnameVerifier(ConscryptHostnameVerifier)
+   */
+  public synchronized static ConscryptHostnameVerifier getDefaultHostnameVerifier(TrustManager trustManager) {
+    return TrustManagerImpl.getDefaultHostnameVerifier();
+  }
+
+  /**
+   * Set the hostname verifier that will be used for HTTPS endpoint identification by the
+   * given trust manager.  If {@code null} (the default), endpoint identification will use the
+   * default hostname verifier set in {@link #setDefaultHostnameVerifier(ConscryptHostnameVerifier)}.
+   *
+   * @throws IllegalArgumentException if the provided trust manager is not a Conscrypt trust
+   * manager per {@link #isConscrypt(TrustManager)}
+   */
+  public static void setHostnameVerifier(TrustManager trustManager, ConscryptHostnameVerifier verifier) {
+    toConscrypt(trustManager).setHostnameVerifier(verifier);
+  }
+
+  /**
+   * Returns the currently-set hostname verifier for the given trust manager.
+   *
+   * @throws IllegalArgumentException if the provided trust manager is not a Conscrypt trust
+   * manager per {@link #isConscrypt(TrustManager)}
+   *
+   * @see #setHostnameVerifier(TrustManager, ConscryptHostnameVerifier)
+   */
+  public static ConscryptHostnameVerifier getHostnameVerifier(TrustManager trustManager) {
+    return toConscrypt(trustManager).getHostnameVerifier();
+  }
+
+  /**
+   * Wraps the HttpsURLConnection.HostnameVerifier into a ConscryptHostnameVerifier
+   */
+  public static ConscryptHostnameVerifier wrapHostnameVerifier(final HostnameVerifier verifier) {
+    return  new ConscryptHostnameVerifier() {
+      @Override
+      public boolean verify(X509Certificate[] certificates, String hostname, SSLSession session) {
+        return verifier.verify(hostname, session);
+      }
+    };
+  }
+}

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms
 
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.account.AccountAttributes
 
 object AppCapabilities {
@@ -17,7 +16,7 @@ object AppCapabilities {
       changeNumber = true,
       stories = true,
       giftBadges = true,
-      pni = FeatureFlags.phoneNumberPrivacy(),
+      pni = true,
       paymentActivation = true
     )
   }

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;
@@ -27,10 +26,11 @@ import androidx.multidex.MultiDexApplication;
 
 import com.google.android.gms.security.ProviderInstaller;
 
-import org.conscrypt.Conscrypt;
+import org.conscrypt.ConscryptSignal;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.core.util.MemoryTracker;
+import org.signal.core.util.concurrent.AnrDetector;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
@@ -49,11 +49,11 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmFetchManager;
-import org.thoughtcrime.securesms.gcm.FcmJobService;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
+import org.thoughtcrime.securesms.jobs.ExternalLaunchDonationJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.FontDownloaderJob;
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
@@ -61,7 +61,6 @@ 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.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
@@ -71,7 +70,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;
@@ -86,7 +85,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
-import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
+import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
@@ -111,6 +110,7 @@ import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import kotlin.Unit;
 import rxdogtag2.RxDogTag;
 
 /**
@@ -125,9 +125,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private static final String TAG = Log.tag(ApplicationContext.class);
 
-  @VisibleForTesting
-  protected PersistentLogger persistentLogger;
-
   public static ApplicationContext getInstance(Context context) {
     return (ApplicationContext)context.getApplicationContext();
   }
@@ -156,6 +153,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                               initializeLogging();
                               Log.i(TAG, "onCreate()");
                             })
+                            .addBlocking("anr-detector", this::startAnrDetector)
                             .addBlocking("security-provider", this::initializeSecurityProvider)
                             .addBlocking("crash-handling", this::initializeCrashHandling)
                             .addBlocking("rx-init", this::initializeRx)
@@ -170,7 +168,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("proxy-init", () -> {
                               if (SignalStore.proxy().isProxyEnabled()) {
                                 Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
-                                Conscrypt.setUseEngineSocketByDefault(true);
+                                ConscryptSignal.setUseEngineSocketByDefault(true);
                               }
                             })
                             .addBlocking("blob-provider", this::initializeBlobProvider)
@@ -186,7 +184,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)
@@ -231,7 +228,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
     ApplicationDependencies.getDeadlockDetector().start();
     SubscriptionKeepAliveJob.enqueueAndTrackTimeIfNecessary();
+    ExternalLaunchDonationJob.enqueueIfNecessary();
     FcmFetchManager.onForeground(this);
+    startAnrDetector();
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();
@@ -265,10 +264,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getShakeToReport().disable();
     ApplicationDependencies.getDeadlockDetector().stop();
     MemoryTracker.stop();
-  }
-
-  public PersistentLogger getPersistentLogger() {
-    return persistentLogger;
+    AnrDetector.stop();
   }
 
   public void checkBuildExpiration() {
@@ -278,6 +274,17 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
+  /**
+   * Note: this is purposefully "started" twice -- once during application create, and once during foreground.
+   * This is so we can capture ANR's that happen on boot before the foreground event.
+   */
+  private void startAnrDetector() {
+    AnrDetector.start(TimeUnit.SECONDS.toMillis(5), FeatureFlags::internalUser, (dumps) -> {
+      LogDatabase.getInstance(this).anrs().save(System.currentTimeMillis(), dumps);
+      return Unit.INSTANCE;
+    });
+  }
+
   private void initializeSecurityProvider() {
     int aesPosition = Security.insertProviderAt(new AesGcmProvider(), 1);
     Log.i(TAG, "Installed AesGcmProvider: " + aesPosition);
@@ -287,7 +294,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
       throw new ProviderInitializationException();
     }
 
-    int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
+    int conscryptPosition = Security.insertProviderAt(ConscryptSignal.newProvider(), 2);
     Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);
 
     if (conscryptPosition < 0) {
@@ -297,14 +304,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @VisibleForTesting
   protected void initializeLogging() {
-    persistentLogger = new PersistentLogger(this);
-    org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);
+    Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
 
     SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
 
     SignalExecutors.UNBOUNDED.execute(() -> {
       Log.blockUntilAllWritesFinished();
-      LogDatabase.getInstance(this).trimToSize();
+      LogDatabase.getInstance(this).logs().trimToSize();
+      LogDatabase.getInstance(this).crashes().trimToSize();
     });
   }
 
@@ -406,10 +413,10 @@ 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);
+    if (BuildConfig.MANAGES_APP_UPDATES) {
+      ApkUpdateRefreshListener.schedule(this);
     }
   }
 
@@ -419,6 +426,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
       if (FeatureFlags.callingFieldTrialAnyAddressPortsKillSwitch()) {
         fieldTrials.put("RingRTC-AnyAddressPortsKillSwitch", "Enabled");
       }
+      if (!SignalStore.internalValues().callingDisableLBRed()) {
+        fieldTrials.put("RingRTC-Audio-LBRed-For-Opus", "Enabled,bitrate_pri:22000");
+      }
       CallManager.initialize(this, new RingRtcLogger(), fieldTrials);
     } catch (UnsatisfiedLinkError e) {
       throw new AssertionError("Unable to load ringrtc library", e);
@@ -449,18 +459,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/AvatarPreviewActivity.java

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

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

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

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

@@ -57,6 +57,10 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
 
   void setEventListener(@Nullable EventListener listener);
 
+  default void setParentScrolling(boolean isParentScrolling) {
+    // Intentionally Blank.
+  }
+
   default void updateTimestamps() {
     // Intentionally Blank.
   }

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

@@ -35,7 +35,6 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.Px;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
@@ -50,6 +49,8 @@ import androidx.transition.TransitionManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
+import org.signal.core.util.concurrent.LifecycleDisposable;
+import org.signal.core.util.concurrent.RxExtensions;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
@@ -70,10 +71,11 @@ import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.groups.ui.GroupLimitDialog;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
+import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameAciFetchResult;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -85,6 +87,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -145,6 +148,8 @@ public final class ContactSelectionListFragment extends LoggingFragment {
   private           Set<RecipientId>                     currentSelection;
   private           boolean                              isMulti;
   private           boolean                              canSelectSelf;
+  private           boolean                              resetPositionOnCommit = false;
+
   private           ListClickListener                    listClickListener = new ListClickListener();
   @Nullable private SwipeRefreshLayout.OnRefreshListener onRefreshListener;
 
@@ -423,6 +428,10 @@ public final class ContactSelectionListFragment extends LoggingFragment {
     onRefreshListener = null;
   }
 
+  public int getSelectedMembersSize() {
+    return contactSearchMediator.getSelectedMembersSize();
+  }
+
   private @NonNull Bundle safeArguments() {
     return getArguments() != null ? getArguments() : new Bundle();
   }
@@ -519,12 +528,21 @@ public final class ContactSelectionListFragment extends LoggingFragment {
   }
 
   public void setQueryFilter(String filter) {
-    this.cursorFilter = filter;
+    if (Objects.equals(filter, this.cursorFilter)) {
+      return;
+    }
+
+    this.resetPositionOnCommit = true;
+    this.cursorFilter          = filter;
+
     contactSearchMediator.onFilterChanged(filter);
   }
 
   public void resetQueryFilter() {
     setQueryFilter(null);
+
+    this.resetPositionOnCommit = true;
+
     swipeRefresh.setRefreshing(false);
   }
 
@@ -542,11 +560,12 @@ public final class ContactSelectionListFragment extends LoggingFragment {
     headerActionView.setVisibility(View.GONE);
   }
 
-  public void setRecyclerViewPaddingBottom(@Px int paddingBottom) {
-    ViewUtil.setPaddingBottom(recyclerView, paddingBottom);
-  }
-
   private void onLoadFinished(int count) {
+    if (resetPositionOnCommit) {
+      resetPositionOnCommit = false;
+      recyclerView.scrollToPosition(0);
+    }
+
     swipeRefresh.setVisibility(View.VISIBLE);
     showContactsLayout.setVisibility(View.GONE);
 
@@ -666,11 +685,18 @@ public final class ContactSelectionListFragment extends LoggingFragment {
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
           SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            return UsernameUtil.fetchAciForUsername(username);
-          }, uuid -> {
+            try {
+              return RxExtensions.safeBlockingGet(UsernameRepository.fetchAciForUsername(UsernameUtil.sanitizeUsernameFromSearch(username)));
+            } catch (InterruptedException e) {
+              Log.w(TAG, "Interrupted?", e);
+              return UsernameAciFetchResult.NetworkError.INSTANCE;
+            }
+          }, result  -> {
             loadingDialog.dismiss();
-            if (uuid.isPresent()) {
-              Recipient       recipient = Recipient.externalUsername(uuid.get(), username);
+
+            // TODO Could be more specific with errors
+            if (result instanceof UsernameAciFetchResult.Success success) {
+              Recipient       recipient = Recipient.externalUsername(success.getAci(), username);
               SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), username);
 
               if (onContactSelectedListener != null) {

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

@@ -5,13 +5,11 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -32,7 +30,7 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.util.Base64;
+import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;

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;
@@ -15,14 +16,16 @@ 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.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
-import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics;
+import org.thoughtcrime.securesms.notifications.VitalsViewModel;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -42,6 +45,9 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
   private VoiceNoteMediaController      mediaController;
   private ConversationListTabsViewModel conversationListTabsViewModel;
+  private VitalsViewModel               vitalsViewModel;
+
+  private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
 
   private boolean onFirstRender = false;
 
@@ -76,6 +82,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
           }
         });
 
+    lifecycleDisposable.bindTo(this);
 
     mediaController = new VoiceNoteMediaController(this, true);
 
@@ -91,6 +98,30 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
     conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
     updateTabVisibility();
+
+    vitalsViewModel = new ViewModelProvider(this).get(VitalsViewModel.class);
+
+    lifecycleDisposable.add(
+        vitalsViewModel
+            .getVitalsState()
+            .subscribe(this::presentVitalsState)
+    );
+  }
+
+  @SuppressLint("NewApi")
+  private void presentVitalsState(VitalsViewModel.State state) {
+    switch (state) {
+      case NONE:
+        break;
+      case PROMPT_BATTERY_SAVER_DIALOG:
+        PromptBatterySaverDialogFragment.show(getSupportFragmentManager());
+        break;
+      case PROMPT_DEBUGLOGS_FOR_NOTIFICATIONS:
+        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.NOTIFICATIONS);
+      case PROMPT_DEBUGLOGS_FOR_CRASH:
+        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.CRASH);
+        break;
+    }
   }
 
   @Override
@@ -139,9 +170,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
     updateTabVisibility();
 
-    if (SlowNotificationHeuristics.shouldPromptUserForLogs()) {
-      DebugLogsPromptDialogFragment.show(this, getSupportFragmentManager());
-    }
+    vitalsViewModel.checkSlowNotificationHeuristics();
   }
 
   @Override

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

@@ -51,7 +51,6 @@ 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.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
@@ -313,7 +312,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private @Nullable ActionItem createRemoveActionItem(@NonNull Recipient recipient) {
-    if (!FeatureFlags.hideContacts() || recipient.isSelf() || recipient.isGroup()) {
+    if (recipient.isSelf() || recipient.isGroup()) {
       return null;
     }
 

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

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

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

@@ -19,13 +19,12 @@ 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.CreateSvrPinActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.pin.PinRestoreActivity;
-import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
+import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
@@ -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();
@@ -238,7 +228,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getCreateProfileNameIntent() {
-    Intent intent = EditProfileActivity.getIntentForUserProfile(this);
+    Intent intent = CreateProfileActivity.getIntentForUserProfile(this);
     return getRoutedIntent(intent, getIntent());
   }
 

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

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

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

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

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate
+
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * Provided to the DownloadManager as a callback receiver for when it has finished downloading the APK we're trying to install.
+ *
+ * Registered in the manifest to list to [DownloadManager.ACTION_DOWNLOAD_COMPLETE].
+ */
+class ApkUpdateDownloadManagerReceiver : BroadcastReceiver() {
+
+  companion object {
+    private val TAG = Log.tag(ApkUpdateDownloadManagerReceiver::class.java)
+  }
+
+  override fun onReceive(context: Context, intent: Intent) {
+    Log.i(TAG, "onReceive()")
+
+    if (DownloadManager.ACTION_DOWNLOAD_COMPLETE != intent.action) {
+      Log.i(TAG, "Unexpected action: " + intent.action)
+      return
+    }
+
+    val downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2)
+    if (downloadId != SignalStore.apkUpdate().downloadId) {
+      Log.w(TAG, "downloadId doesn't match the one we're waiting for! Ignoring.")
+      return
+    }
+
+    ApkUpdateInstaller.installOrPromptForInstall(context, downloadId, userInitiated = false)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import android.os.Build
+import org.signal.core.util.PendingIntentFlags
+import org.signal.core.util.StreamUtil
+import org.signal.core.util.getDownloadManager
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobs.ApkUpdateJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.Environment
+import org.thoughtcrime.securesms.util.FileUtils
+import java.io.FileInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.security.MessageDigest
+
+object ApkUpdateInstaller {
+
+  private val TAG = Log.tag(ApkUpdateInstaller::class.java)
+
+  /**
+   * Installs the downloaded APK silently if possible. If not, prompts the user with a notification to install.
+   * May show errors instead under certain conditions.
+   *
+   * A common pattern you may see is that this is called with [userInitiated] = false (or some other state
+   * that prevents us from auto-updating, like the app being in the foreground), causing this function
+   * to show an install prompt notification. The user clicks that notification, calling this with
+   * [userInitiated] = true, and then everything installs.
+   */
+  fun installOrPromptForInstall(context: Context, downloadId: Long, userInitiated: Boolean) {
+    if (downloadId != SignalStore.apkUpdate().downloadId) {
+      Log.w(TAG, "DownloadId doesn't match the one we're waiting for (current: $downloadId, expected: ${SignalStore.apkUpdate().downloadId})! We likely have newer data. Ignoring.")
+      ApkUpdateNotifications.dismissInstallPrompt(context)
+      ApplicationDependencies.getJobManager().add(ApkUpdateJob())
+      return
+    }
+
+    val digest = SignalStore.apkUpdate().digest
+    if (digest == null) {
+      Log.w(TAG, "DownloadId matches, but digest is null! Inconsistent state. Failing and clearing state.")
+      SignalStore.apkUpdate().clearDownloadAttributes()
+      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
+      return
+    }
+
+    if (!isMatchingDigest(context, downloadId, digest)) {
+      Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
+      SignalStore.apkUpdate().clearDownloadAttributes()
+      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
+      return
+    }
+
+    if (!userInitiated && !shouldAutoUpdate()) {
+      Log.w(TAG, "Not user-initiated and not eligible for auto-update. Prompting. (API=${Build.VERSION.SDK_INT}, Foreground=${ApplicationDependencies.getAppForegroundObserver().isForegrounded}, AutoUpdate=${SignalStore.apkUpdate().autoUpdate})")
+      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
+      return
+    }
+
+    try {
+      installApk(context, downloadId, userInitiated)
+    } catch (e: IOException) {
+      Log.w(TAG, "Hit IOException when trying to install APK!", e)
+      SignalStore.apkUpdate().clearDownloadAttributes()
+      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
+    } catch (e: SecurityException) {
+      Log.w(TAG, "Hit SecurityException when trying to install APK!", e)
+      SignalStore.apkUpdate().clearDownloadAttributes()
+      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
+    }
+  }
+
+  @Throws(IOException::class, SecurityException::class)
+  private fun installApk(context: Context, downloadId: Long, userInitiated: Boolean) {
+    val apkInputStream: InputStream? = getDownloadedApkInputStream(context, downloadId)
+    if (apkInputStream == null) {
+      Log.w(TAG, "Could not open download APK input stream!")
+      return
+    }
+
+    Log.d(TAG, "Beginning APK install...")
+    val packageInstaller: PackageInstaller = context.packageManager.packageInstaller
+
+    val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply {
+      // At this point, we always want to set this if possible, since we've already prompted the user with our own notification when necessary.
+      // This lets us skip the system-generated notification.
+      if (Build.VERSION.SDK_INT >= 31) {
+        setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
+      }
+    }
+
+    Log.d(TAG, "Creating install session...")
+    val sessionId: Int = packageInstaller.createSession(sessionParams)
+    val session: PackageInstaller.Session = packageInstaller.openSession(sessionId)
+
+    Log.d(TAG, "Writing APK data...")
+    session.use { activeSession ->
+      val sessionOutputStream = activeSession.openWrite(context.packageName, 0, -1)
+      StreamUtil.copy(apkInputStream, sessionOutputStream)
+    }
+
+    val installerPendingIntent = PendingIntent.getBroadcast(
+      context,
+      sessionId,
+      Intent(context, ApkUpdatePackageInstallerReceiver::class.java).apply {
+        putExtra(ApkUpdatePackageInstallerReceiver.EXTRA_USER_INITIATED, userInitiated)
+        putExtra(ApkUpdatePackageInstallerReceiver.EXTRA_DOWNLOAD_ID, downloadId)
+      },
+      PendingIntentFlags.mutable() or PendingIntentFlags.updateCurrent()
+    )
+
+    Log.d(TAG, "Committing session...")
+    session.commit(installerPendingIntent.intentSender)
+  }
+
+  private fun getDownloadedApkInputStream(context: Context, downloadId: Long): InputStream? {
+    return try {
+      FileInputStream(context.getDownloadManager().openDownloadedFile(downloadId).fileDescriptor)
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      null
+    }
+  }
+
+  private fun isMatchingDigest(context: Context, downloadId: Long, expectedDigest: ByteArray): Boolean {
+    return try {
+      FileInputStream(context.getDownloadManager().openDownloadedFile(downloadId).fileDescriptor).use { stream ->
+        val digest = FileUtils.getFileDigest(stream)
+        MessageDigest.isEqual(digest, expectedDigest)
+      }
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      false
+    }
+  }
+
+  private fun shouldAutoUpdate(): Boolean {
+    // TODO Auto-updates temporarily restricted to nightlies. Once we have designs for allowing users to opt-out of auto-updates, we can re-enable this
+    return Environment.IS_NIGHTLY && Build.VERSION.SDK_INT >= 31 && SignalStore.apkUpdate().autoUpdate && !ApplicationDependencies.getAppForegroundObserver().isForegrounded
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotificationReceiver.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import org.signal.core.util.logging.Log
+
+/**
+ * Receiver that is triggered based on various notification actions that can be taken on update-related notifications.
+ */
+class ApkUpdateNotificationReceiver : BroadcastReceiver() {
+
+  companion object {
+    private val TAG = Log.tag(ApkUpdateNotificationReceiver::class.java)
+
+    const val ACTION_INITIATE_INSTALL = "signal.apk_update_notification.initiate_install"
+    const val EXTRA_DOWNLOAD_ID = "signal.download_id"
+  }
+
+  override fun onReceive(context: Context, intent: Intent?) {
+    if (intent == null) {
+      Log.w(TAG, "Null intent")
+      return
+    }
+
+    val downloadId: Long = intent.getLongExtra(EXTRA_DOWNLOAD_ID, -2)
+
+    when (val action: String? = intent.action) {
+      ACTION_INITIATE_INSTALL -> handleInstall(context, downloadId)
+      else -> Log.w(TAG, "Unrecognized notification action: $action")
+    }
+  }
+
+  private fun handleInstall(context: Context, downloadId: Long) {
+    Log.i(TAG, "Got action to install.")
+    ApkUpdateInstaller.installOrPromptForInstall(context, downloadId, userInitiated = true)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import org.signal.core.util.PendingIntentFlags
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.NotificationIds
+import org.thoughtcrime.securesms.util.ServiceUtil
+
+object ApkUpdateNotifications {
+
+  val TAG = Log.tag(ApkUpdateNotifications::class.java)
+
+  /**
+   * Shows a notification to prompt the user to install the app update. Only shown when silently auto-updating is not possible or are disabled by the user.
+   * Note: This is an 'ongoing' notification (i.e. not-user dismissable) and never dismissed programatically. This is because the act of installing the APK
+   * will dismiss it for us.
+   */
+  @SuppressLint("LaunchActivityFromNotification")
+  fun showInstallPrompt(context: Context, downloadId: Long) {
+    Log.d(TAG, "Showing install prompt. DownloadId: $downloadId")
+    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_FAILED_INSTALL)
+
+    val pendingIntent = PendingIntent.getBroadcast(
+      context,
+      1,
+      Intent(context, ApkUpdateNotificationReceiver::class.java).apply {
+        action = ApkUpdateNotificationReceiver.ACTION_INITIATE_INSTALL
+        putExtra(ApkUpdateNotificationReceiver.EXTRA_DOWNLOAD_ID, downloadId)
+      },
+      PendingIntentFlags.updateCurrent()
+    )
+
+    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
+      .setOngoing(true)
+      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_prompt_install_title))
+      .setContentText(context.getString(R.string.ApkUpdateNotifications_prompt_install_body))
+      .setSmallIcon(R.drawable.ic_notification)
+      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
+      .setContentIntent(pendingIntent)
+      .build()
+
+    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_PROMPT_INSTALL, notification)
+  }
+
+  fun dismissInstallPrompt(context: Context) {
+    Log.d(TAG, "Dismissing install prompt.")
+    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_PROMPT_INSTALL)
+  }
+
+  fun showInstallFailed(context: Context, reason: FailureReason) {
+    Log.d(TAG, "Showing failed notification. Reason: $reason")
+    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_PROMPT_INSTALL)
+
+    val pendingIntent = PendingIntent.getActivity(
+      context,
+      0,
+      Intent(context, MainActivity::class.java),
+      PendingIntentFlags.immutable()
+    )
+
+    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
+      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_failed_general_title))
+      .setContentText(context.getString(R.string.ApkUpdateNotifications_failed_general_body))
+      .setSmallIcon(R.drawable.ic_notification)
+      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
+      .setContentIntent(pendingIntent)
+      .setAutoCancel(true)
+      .build()
+
+    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_FAILED_INSTALL, notification)
+  }
+
+  fun showAutoUpdateSuccess(context: Context) {
+    val pendingIntent = PendingIntent.getActivity(
+      context,
+      0,
+      Intent(context, MainActivity::class.java),
+      PendingIntentFlags.immutable()
+    )
+
+    val appVersionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName
+
+    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
+      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_auto_update_success_title))
+      .setContentText(context.getString(R.string.ApkUpdateNotifications_auto_update_success_body, appVersionName))
+      .setSmallIcon(R.drawable.ic_notification)
+      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
+      .setContentIntent(pendingIntent)
+      .setAutoCancel(true)
+      .build()
+
+    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_SUCCESSFUL_INSTALL, notification)
+  }
+
+  enum class FailureReason {
+    UNKNOWN,
+    ABORTED,
+    BLOCKED,
+    INCOMPATIBLE,
+    INVALID,
+    CONFLICT,
+    STORAGE,
+    TIMEOUT
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import org.signal.core.util.getParcelableExtraCompat
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.apkupdate.ApkUpdateNotifications.FailureReason
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * This is the receiver that is triggered by the [PackageInstaller] to notify of various events. Package installation is initiated
+ * in [ApkUpdateInstaller].
+ */
+class ApkUpdatePackageInstallerReceiver : BroadcastReceiver() {
+
+  companion object {
+    private val TAG = Log.tag(ApkUpdatePackageInstallerReceiver::class.java)
+
+    const val EXTRA_USER_INITIATED = "signal.user_initiated"
+    const val EXTRA_DOWNLOAD_ID = "signal.download_id"
+  }
+
+  override fun onReceive(context: Context, intent: Intent?) {
+    val statusCode: Int = intent?.getIntExtra(PackageInstaller.EXTRA_STATUS, -1) ?: -1
+    val statusMessage: String? = intent?.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
+    val userInitiated = intent?.getBooleanExtra(EXTRA_USER_INITIATED, false) ?: false
+
+    Log.w(TAG, "[onReceive] Status: $statusCode, Message: $statusMessage")
+
+    when (statusCode) {
+      PackageInstaller.STATUS_SUCCESS -> {
+        if (SignalStore.apkUpdate().lastApkUploadTime != SignalStore.apkUpdate().pendingApkUploadTime) {
+          Log.i(TAG, "Update installed successfully! Updating our lastApkUploadTime to ${SignalStore.apkUpdate().pendingApkUploadTime}")
+          SignalStore.apkUpdate().lastApkUploadTime = SignalStore.apkUpdate().pendingApkUploadTime
+          ApkUpdateNotifications.showAutoUpdateSuccess(context)
+        } else {
+          Log.i(TAG, "Spurious 'success' notification?")
+        }
+      }
+      PackageInstaller.STATUS_PENDING_USER_ACTION -> handlePendingUserAction(context, userInitiated, intent!!)
+      PackageInstaller.STATUS_FAILURE_ABORTED -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.ABORTED)
+      PackageInstaller.STATUS_FAILURE_BLOCKED -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.BLOCKED)
+      PackageInstaller.STATUS_FAILURE_INCOMPATIBLE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.INCOMPATIBLE)
+      PackageInstaller.STATUS_FAILURE_INVALID -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.INVALID)
+      PackageInstaller.STATUS_FAILURE_CONFLICT -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.CONFLICT)
+      PackageInstaller.STATUS_FAILURE_STORAGE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.STORAGE)
+      PackageInstaller.STATUS_FAILURE_TIMEOUT -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.TIMEOUT)
+      PackageInstaller.STATUS_FAILURE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.UNKNOWN)
+      else -> Log.w(TAG, "Unknown status! $statusCode")
+    }
+  }
+
+  private fun handlePendingUserAction(context: Context, userInitiated: Boolean, intent: Intent) {
+    val downloadId = intent.getLongExtra(EXTRA_DOWNLOAD_ID, -2)
+
+    if (!userInitiated) {
+      Log.w(TAG, "Not user-initiated, but needs user action! Showing prompt notification.")
+      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
+      return
+    }
+
+    val promptIntent: Intent? = intent.getParcelableExtraCompat(Intent.EXTRA_INTENT, Intent::class.java)
+    if (promptIntent == null) {
+      Log.w(TAG, "Missing prompt intent! Showing prompt notification instead.")
+      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
+      return
+    }
+
+    promptIntent.apply {
+      putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
+      putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME, "com.android.vending")
+      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+
+    context.startActivity(promptIntent)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java

@@ -1,22 +1,28 @@
-package org.thoughtcrime.securesms.service;
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate;
 
 
 import android.content.Context;
-import android.content.Intent;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.UpdateApkJob;
+import org.thoughtcrime.securesms.jobs.ApkUpdateJob;
+import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
 
-public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
+public class ApkUpdateRefreshListener extends PersistentAlarmManagerListener {
 
-  private static final String TAG = Log.tag(UpdateApkRefreshListener.class);
+  private static final String TAG = Log.tag(ApkUpdateRefreshListener.class);
 
-  private static final long INTERVAL = TimeUnit.HOURS.toMillis(6);
+  private static final long INTERVAL = Environment.IS_NIGHTLY ? TimeUnit.HOURS.toMillis(2) : TimeUnit.HOURS.toMillis(6);
 
   @Override
   protected long getNextScheduledExecutionTime(Context context) {
@@ -27,9 +33,9 @@ public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
   protected long onAlarm(Context context, long scheduledTime) {
     Log.i(TAG, "onAlarm...");
 
-    if (scheduledTime != 0 && BuildConfig.PLAY_STORE_DISABLED) {
+    if (scheduledTime != 0 && BuildConfig.MANAGES_APP_UPDATES) {
       Log.i(TAG, "Queueing APK update job...");
-      ApplicationDependencies.getJobManager().add(new UpdateApkJob());
+      ApplicationDependencies.getJobManager().add(new ApkUpdateJob());
     }
 
     long newTime = System.currentTimeMillis() + INTERVAL;
@@ -39,7 +45,7 @@ public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
   }
 
   public static void schedule(Context context) {
-    new UpdateApkRefreshListener().onReceive(context, getScheduleIntent());
+    new ApkUpdateRefreshListener().onReceive(context, getScheduleIntent());
   }
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.groups.ParcelableGroupId
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 import org.thoughtcrime.securesms.mediasend.Media
+import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -238,7 +239,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
   @Suppress("DEPRECATION")
   private fun openGallery() {
     Permissions.with(this)
-      .request(Manifest.permission.READ_EXTERNAL_STORAGE)
+      .request(*PermissionCompat.forImages())
       .ifNecessary()
       .onAllGranted {
         val intent = AvatarSelectionActivity.getIntentForGallery(requireContext())

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

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

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

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

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

@@ -8,6 +8,7 @@ import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageSize
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.glide.GiftBadgeModel
 import org.thoughtcrime.securesms.mms.GlideApp
@@ -31,6 +32,10 @@ class BadgeImageView @JvmOverloads constructor(
     isClickable = false
   }
 
+  constructor(context: Context, badgeImageSize: BadgeImageSize) : this(context) {
+    badgeSize = badgeImageSize.sizeCode
+  }
+
   override fun setOnClickListener(l: OnClickListener?) {
     val wasClickable = isClickable
     super.setOnClickListener(l)
@@ -95,8 +100,10 @@ class BadgeImageView @JvmOverloads constructor(
   }
 
   private fun clearDrawable() {
-    setImageDrawable(null)
-    isClickable = false
+    if (drawable != null) {
+      setImageDrawable(null)
+      isClickable = false
+    }
   }
 
   private fun getGlideRequests(): GlideRequests? {

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

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

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

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

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

@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.badges.gifts
 
 import android.content.Context
+import org.signal.core.util.Base64
 import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.Base64
 import java.lang.Integer.min
 import java.util.concurrent.TimeUnit
 
@@ -32,7 +32,7 @@ object Gifts {
   ): OutgoingMessage {
     return OutgoingMessage(
       threadRecipient = recipient,
-      body = Base64.encodeBytes(giftBadge.toByteArray()),
+      body = Base64.encodeWithPadding(giftBadge.encode()),
       isSecure = true,
       sentTimeMillis = sentTimestamp,
       expiresIn = expiresIn,

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

@@ -14,6 +14,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.InputAwareLayout
@@ -26,6 +27,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.donate.Do
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationCheckoutDelegate
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationProcessorAction
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.RecipientPreference
@@ -83,7 +85,7 @@ class GiftFlowConfirmationFragment :
 
     keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
 
-    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, DonationErrorSource.GIFT)
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, viewModel.uiSessionKey, DonationErrorSource.GIFT)
 
     processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
       .setView(R.layout.processing_payment_dialog)
@@ -106,6 +108,7 @@ class GiftFlowConfirmationFragment :
         GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToGatewaySelectorBottomSheet(
           with(viewModel.snapshot) {
             GatewayRequest(
+              uiSessionKey = viewModel.uiSessionKey,
               donateToSignalType = DonateToSignalType.GIFT,
               badge = giftBadge!!,
               label = getString(R.string.preferences__one_time),
@@ -262,6 +265,14 @@ class GiftFlowConfirmationFragment :
     findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToCreditCardFragment(gatewayRequest))
   }
 
+  override fun navigateToIdealDetailsFragment(gatewayRequest: GatewayRequest) {
+    error("Unsupported operation")
+  }
+
+  override fun navigateToBankTransferMandate(gatewayResponse: GatewayResponse) {
+    error("Unsupported operation")
+  }
+
   override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
     val mainActivityIntent = MainActivity.clearTop(requireContext())
 
@@ -275,7 +286,10 @@ class GiftFlowConfirmationFragment :
   }
 
   override fun onProcessorActionProcessed() = Unit
-  override fun onUserCancelledPaymentFlow() {
-    findNavController().popBackStack(R.id.giftFlowConfirmationFragment, false)
-  }
+
+  override fun showSepaEuroMaximumDialog(sepaEuroMaximum: FiatMoney) = error("Unsupported operation")
+
+  override fun onUserLaunchedAnExternalApplication() = Unit
+
+  override fun navigateToDonationPending(gatewayRequest: GatewayRequest) = error("Unsupported operation")
 }

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

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

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

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

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

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

app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt

@@ -59,73 +59,93 @@ class BadgeSpriteTransformation(
     return outBitmap
   }
 
-  enum class Size(val code: String, val frameMap: Map<Density, FrameSet>) {
+  enum class Size(val code: String) {
     SMALL(
-      "small",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)),
-        Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)),
-        Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)),
-        Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)),
-        Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)),
-        Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64))
-      )
-    ),
+      "small"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)),
+          Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)),
+          Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)),
+          Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)),
+          Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)),
+          Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64))
+        )
+      }
+    },
     MEDIUM(
-      "medium",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)),
-        Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)),
-        Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)),
-        Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)),
-        Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)),
-        Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96))
-      )
-    ),
+      "medium"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)),
+          Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)),
+          Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)),
+          Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)),
+          Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)),
+          Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96))
+        )
+      }
+    },
     LARGE(
-      "large",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)),
-        Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)),
-        Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)),
-        Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)),
-        Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)),
-        Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144))
-      )
-    ),
+      "large"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)),
+          Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)),
+          Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)),
+          Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)),
+          Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)),
+          Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144))
+        )
+      }
+    },
     BADGE_64(
-      "badge_64",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)),
-        Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)),
-        Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)),
-        Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)),
-        Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)),
-        Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256))
-      )
-    ),
+      "badge_64"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)),
+          Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)),
+          Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)),
+          Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)),
+          Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)),
+          Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256))
+        )
+      }
+    },
     BADGE_112(
-      "badge_112",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)),
-        Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)),
-        Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)),
-        Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)),
-        Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)),
-        Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448))
-      )
-    ),
+      "badge_112"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)),
+          Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)),
+          Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)),
+          Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)),
+          Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)),
+          Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448))
+        )
+      }
+    },
     XLARGE(
-      "xlarge",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)),
-        Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)),
-        Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)),
-        Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)),
-        Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)),
-        Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640))
-      )
-    );
+      "xlarge"
+    ) {
+      override val frameMap: Map<Density, FrameSet> by lazy {
+        mapOf(
+          Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)),
+          Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)),
+          Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)),
+          Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)),
+          Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)),
+          Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640))
+        )
+      }
+    };
+
+    abstract val frameMap: Map<Density, FrameSet>
 
     companion object {
       fun fromInteger(integer: Int): Size {

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

@@ -6,6 +6,7 @@ import android.os.Parcelable
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.compose.runtime.Stable
 import com.bumptech.glide.load.Key
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
@@ -25,6 +26,7 @@ typealias OnBadgeClicked = (Badge, Boolean, Boolean) -> Unit
 /**
  * A Badge that can be collected and displayed by a user.
  */
+@Stable
 @Parcelize
 data class Badge(
   val id: String,

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

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

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

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.badges.self.expired
 import androidx.fragment.app.FragmentManager
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.logging.Log
-import org.signal.donations.StripeDeclineCode
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.ExpiredBadge
@@ -13,18 +12,15 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.shouldRouteToGooglePay
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
-import org.thoughtcrime.securesms.util.CommunicationActions
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 
 /**
  * Bottom sheet displaying a fading badge with a notice and action for becoming a subscriber again.
  */
-class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
+class ExpiredOneTimeBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   peekHeightPercentage = 1f
 ) {
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
@@ -34,12 +30,9 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun getConfiguration(): DSLConfiguration {
-    val args = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
+    val args = ExpiredOneTimeBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
     val badge: Badge = args.badge
-    val cancellationReason = UnexpectedSubscriptionCancellation.fromStatus(args.cancelationReason)
-    val declineCode: StripeDeclineCode? = args.chargeFailure?.let { StripeDeclineCode.getFromCode(it) }
     val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
-    val inactive = cancellationReason == UnexpectedSubscriptionCancellation.INACTIVE
 
     Log.d(TAG, "Displaying Expired Badge Fragment with bundle: ${requireArguments()}", true)
 
@@ -61,63 +54,32 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
 
       noPadTextPref(
         DSLSettingsText.from(
-          if (badge.isBoost()) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and)
-          } else if (declineCode != null) {
-            getString(
-              R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s,
-              getString(declineCode.mapToErrorStringResource()),
-              badge.name
-            )
-          } else if (inactive) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically, badge.name)
-          } else {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled)
-          },
+          getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and),
           DSLSettingsText.CenterModifier
         )
       )
 
       space(DimensionUnit.DP.toPixels(16f).toInt())
 
-      if (badge.isSubscription() && declineCode?.shouldRouteToGooglePay() == true) {
-        space(DimensionUnit.DP.toPixels(68f).toInt())
-
-        secondaryButtonNoOutline(
-          text = DSLSettingsText.from(R.string.ExpiredBadgeBottomSheetDialogFragment__go_to_google_pay),
-          onClick = {
-            CommunicationActions.openBrowserLink(requireContext(), getString(R.string.google_pay_url))
-          }
-        )
-      } else {
-        noPadTextPref(
-          DSLSettingsText.from(
-            if (badge.isBoost()) {
-              if (isLikelyASustainer) {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
-              } else {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
-              }
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
-            },
-            DSLSettingsText.CenterModifier
-          )
+      noPadTextPref(
+        DSLSettingsText.from(
+          if (isLikelyASustainer) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
+          } else {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
+          },
+          DSLSettingsText.CenterModifier
         )
+      )
 
-        space(DimensionUnit.DP.toPixels(92f).toInt())
-      }
+      space(DimensionUnit.DP.toPixels(92f).toInt())
 
       primaryButton(
         text = DSLSettingsText.from(
-          if (badge.isBoost()) {
-            if (isLikelyASustainer) {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
-            }
+          if (isLikelyASustainer) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
           } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__renew_subscription
+            R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
           }
         ),
         onClick = {
@@ -140,7 +102,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   companion object {
-    private val TAG = Log.tag(ExpiredBadgeBottomSheetDialogFragment::class.java)
+    private val TAG = Log.tag(ExpiredOneTimeBadgeBottomSheetDialogFragment::class.java)
 
     @JvmStatic
     fun show(
@@ -149,8 +111,8 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       chargeFailure: ActiveSubscription.ChargeFailure?,
       fragmentManager: FragmentManager
     ) {
-      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status, chargeFailure?.code).build()
-      val fragment = ExpiredBadgeBottomSheetDialogFragment()
+      val args = ExpiredOneTimeBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status, chargeFailure?.code).build()
+      val fragment = ExpiredOneTimeBadgeBottomSheetDialogFragment()
       fragment.arguments = args.toBundle()
 
       fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)

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

@@ -0,0 +1,191 @@
+package org.thoughtcrime.securesms.badges.self.expired
+
+import android.content.res.Configuration
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+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.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+
+class MonthlyDonationCanceledBottomSheetDialogFragment : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 1f
+
+  @Composable
+  override fun SheetContent() {
+    val chargeFailure: ActiveSubscription.ChargeFailure? = SignalStore.donationsValues().getUnexpectedSubscriptionCancelationChargeFailure()
+    val declineCode: StripeDeclineCode = StripeDeclineCode.getFromCode(chargeFailure?.outcomeNetworkReason)
+    val failureCode: StripeFailureCode = StripeFailureCode.getFromCode(chargeFailure?.code)
+
+    val errorMessage = if (declineCode.isKnown()) {
+      declineCode.mapToErrorStringResource()
+    } else if (failureCode.isKnown) {
+      failureCode.mapToErrorStringResource()
+    } else {
+      declineCode.mapToErrorStringResource()
+    }
+
+    MonthlyDonationCanceled(
+      badge = SignalStore.donationsValues().getExpiredBadge(),
+      errorMessageRes = errorMessage,
+      onRenewClicked = {
+        startActivity(AppSettingsActivity.subscriptions(requireContext()))
+        dismissAllowingStateLoss()
+      },
+      onNotNowClicked = {
+        SignalStore.donationsValues().showMonthlyDonationCanceledDialog = false
+        dismissAllowingStateLoss()
+      }
+    )
+  }
+
+  companion object {
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = MonthlyDonationCanceledBottomSheetDialogFragment()
+
+      fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
+}
+
+@Preview(name = "Light Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun MonthlyDonationCanceledPreview() {
+  SignalTheme {
+    Surface {
+      MonthlyDonationCanceled(
+        badge = Badge(
+          id = "",
+          category = Badge.Category.Donor,
+          name = "Signal Star",
+          description = "",
+          imageUrl = Uri.EMPTY,
+          imageDensity = "",
+          expirationTimestamp = 0L,
+          visible = true,
+          duration = 0L
+        ),
+        errorMessageRes = R.string.StripeFailureCode__verify_your_bank_details_are_correct,
+        onRenewClicked = {},
+        onNotNowClicked = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun MonthlyDonationCanceled(
+  badge: Badge?,
+  @StringRes errorMessageRes: Int,
+  onRenewClicked: () -> Unit,
+  onNotNowClicked: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.padding(horizontal = 34.dp)
+  ) {
+    BottomSheets.Handle()
+
+    if (badge != null) {
+      Box(modifier = Modifier.padding(top = 21.dp, bottom = 16.dp)) {
+        BadgeImage112(
+          badge = badge,
+          modifier = Modifier
+            .size(80.dp)
+        )
+
+        Image(
+          imageVector = ImageVector.vectorResource(id = R.drawable.symbol_error_circle_fill_24),
+          contentScale = ContentScale.Inside,
+          contentDescription = null,
+          colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error),
+          modifier = Modifier
+            .size(24.dp)
+            .align(Alignment.TopEnd)
+            .background(
+              color = SignalTheme.colors.colorSurface1,
+              shape = CircleShape
+            )
+        )
+      }
+    }
+
+    Text(
+      text = stringResource(id = R.string.MonthlyDonationCanceled__title),
+      style = MaterialTheme.typography.titleLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurface),
+      modifier = Modifier.padding(bottom = 20.dp)
+    )
+
+    val context = LocalContext.current
+    val learnMore = stringResource(id = R.string.MonthlyDonationCanceled__learn_more)
+    val errorMessage = stringResource(id = errorMessageRes)
+    val fullString = stringResource(id = R.string.MonthlyDonationCanceled__message, errorMessage, learnMore)
+    val spanned = SpanUtil.urlSubsequence(fullString, learnMore, ManageDonationsFragment.DONATE_TROUBLESHOOTING_URL)
+    Texts.LinkifiedText(
+      textWithUrlSpans = spanned,
+      onUrlClick = { CommunicationActions.openBrowserLink(context, it) },
+      style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurfaceVariant),
+      modifier = Modifier.padding(bottom = 36.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onRenewClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 16.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__renew_button))
+    }
+
+    TextButton(
+      onClick = onNotNowClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 56.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__not_now_button))
+    }
+  }
+}

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

@@ -58,7 +58,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
 
       space(DimensionUnit.DP.toPixels(32f).toInt())
 
-      tonalButton(
+      tonalWrappedButton(
         text = DSLSettingsText.from(
           R.string.BecomeASustainerMegaphone__become_a_sustainer
         ),

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

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

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

@@ -23,7 +23,7 @@ import java.net.URLDecoder
 object CallLinks {
   private const val ROOT_KEY = "key"
   private const val HTTPS_LINK_PREFIX = "https://signal.link/call/#key="
-  private const val SNGL_LINK_PREFIX = "sgnl://signal.link/#key="
+  private const val SNGL_LINK_PREFIX = "sgnl://signal.link/call/#key="
 
   private val TAG = Log.tag(CallLinks::class.java)
 
@@ -54,12 +54,11 @@ object CallLinks {
 
   @JvmStatic
   fun isCallLink(url: String): Boolean {
-    if (FeatureFlags.adHocCalling()) {
+    if (!FeatureFlags.adHocCalling()) {
       return false
     }
 
-    if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) {
-      Log.w(TAG, "Invalid url prefix.")
+    if (!url.startsWith(HTTPS_LINK_PREFIX) || !url.startsWith(SNGL_LINK_PREFIX)) {
       return false
     }
 

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

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

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

@@ -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
 
@@ -108,7 +106,13 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
       Spacer(modifier = Modifier.height(12.dp))
 
       Rows.TextRow(
-        text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__add_call_name),
+        text = stringResource(
+          id = if (callLink.state.name.isEmpty()) {
+            R.string.CreateCallLinkBottomSheetDialogFragment__add_call_name
+          } else {
+            R.string.CreateCallLinkBottomSheetDialogFragment__edit_call_name
+          }
+        ),
         onClick = this@CreateCallLinkBottomSheetDialogFragment::onAddACallNameClicked
       )
 
@@ -212,15 +216,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/details/CallLinkDetailsFragment.kt

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