Bump version to 8.14.3

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

.github/workflows/android.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
     - 'main'
-    - '7.**'
+    - '8.**'
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
           submodules: true
@@ -27,13 +27,26 @@ jobs:
       with:
         distribution: temurin
         java-version: 17
-        cache: gradle
 
     - name: Validate Gradle Wrapper
       uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
       # gh api repos/gradle/actions/commits/v6 --jq '.sha'
 
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
+      with:
+        # Only 8.** branch builds write to the cache; everything else (PRs, etc.) reads only.
+        cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/8.') }}
+        # Required to persist the Gradle configuration cache across runs.
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     - name: Build with Gradle
+      env:
+        SIGNAL_BUILD_CACHE_URL: ${{ secrets.SIGNAL_BUILD_CACHE_URL }}
+        SIGNAL_BUILD_CACHE_USER: ${{ secrets.SIGNAL_BUILD_CACHE_USER }}
+        SIGNAL_BUILD_CACHE_PASSWORD: ${{ secrets.SIGNAL_BUILD_CACHE_PASSWORD }}
+        SIGNAL_BUILD_CACHE_PUSH: ${{ startsWith(github.ref, 'refs/heads/8.') }}
       run: ./gradlew qa
 
     - name: Archive reports for failed build

.github/workflows/diffuse.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
         submodules: true
@@ -28,7 +28,15 @@ jobs:
       with:
         distribution: temurin
         java-version: 17
-        cache: gradle
+
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
+      with:
+        # PR-only workflow: always read from the cache, never write.
+        cache-read-only: true
+        # Required to read the Gradle configuration cache persisted by 8.** builds.
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Install NDK
       run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"
@@ -53,7 +61,7 @@ jobs:
       if: steps.cache-base.outputs.cache-hit != 'true'
       run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-base.apk
 
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
         submodules: true

.github/workflows/docker.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       - name: Build image
         run: |

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
       actions: write
 
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10
+      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10
         # gh api repos/actions/stale/commits/v10 --jq '.sha'
         with:
           days-before-stale: 60

app/build.gradle.kts

@@ -27,8 +27,8 @@ plugins {
 val staticIps = Properties().apply { file("static-ips.properties").reader().use { load(it) } }
 staticIps.stringPropertyNames().forEach { rootProject.extra[it] = staticIps.getProperty(it) }
 
-val canonicalVersionCode = 1694
-val canonicalVersionName = "8.12.1"
+val canonicalVersionCode = 1703
+val canonicalVersionName = "8.14.3"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100
 
@@ -56,6 +56,11 @@ val localProperties: Properties? = if (localPropertiesFile.exists()) {
 val quickstartCredentialsDir: String? = localProperties?.getProperty("quickstart.credentials.dir")
 val benchmarkBackupFile: String? = localProperties?.getProperty("benchmark.backup.file")
 
+val isInstrumentationTestRun = gradle.startParameter.taskNames.any { taskName ->
+  val lower = taskName.lowercase()
+  lower.contains("androidtest") || lower.contains("connectedcheck")
+}
+
 val selectableVariants = listOf(
   "nightlyProdSpinner",
   "nightlyProdPerf",
@@ -68,13 +73,11 @@ val selectableVariants = listOf(
   "playProdMocked",
   "playProdNonMinifiedMocked",
   "playProdBenchmark",
-  "playProdInstrumentation",
   "playProdRelease",
   "playStagingDebug",
   "playStagingCanary",
   "playStagingSpinner",
   "playStagingPerf",
-  "playStagingInstrumentation",
   "playStagingRelease",
   "playProdQuickstart",
   "playStagingQuickstart",
@@ -132,7 +135,6 @@ android {
   ndkVersion = libs.versions.ndk.get()
 
   flavorDimensions += listOf("distribution", "environment")
-  testBuildType = "instrumentation"
 
   android.bundle.language.enableSplit = false
 
@@ -219,6 +221,10 @@ android {
     versionCode = (canonicalVersionCode * maxHotfixVersions) + possibleHotfixVersions[currentHotfixVersion]
     versionName = canonicalVersionName
 
+    if (isInstrumentationTestRun) {
+      applicationIdSuffix = ".test_run"
+    }
+
     minSdk = libs.versions.minSdk.get().toInt()
     targetSdk = libs.versions.targetSdk.get().toInt()
 
@@ -253,8 +259,8 @@ android {
     buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
     buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
     buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
-    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb\"")
-    buildConfigField("String", "SVR2_MRENCLAVE", "\"1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708\"")
+    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708\"")
+    buildConfigField("String", "SVR2_MRENCLAVE", "\"ced8217b26228e4b210c985786999d095c4958a94faf37b14acaf25c4cbb02a4\"")
     buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{ \"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\", \"BUkY0I+9+oPgDCn4+Ac6Iu813yvqkDr/ga8DzLxFxuk6\"}")
     buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==\"")
     buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\"")
@@ -344,18 +350,6 @@ android {
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Release\"")
     }
 
-    create("instrumentation") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-      applicationIdSuffix = ".instrumentation"
-
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Instrumentation\"")
-      buildConfigField("String", "STRIPE_BASE_URL", "\"http://127.0.0.1:8080/stripe\"")
-      buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{ \"BVT/2gHqbrG1xzuIypLIOjFgMtihrMld1/5TGADL6Dhv\"}")
-    }
-
     create("spinner") {
       initWith(getByName("debug"))
       isDefault = false
@@ -538,9 +532,10 @@ androidComponents {
       transformationRequest.set(renameRequest)
     }
 
-    // Include the test-only library on debug builds.
-    if (variant.buildType != "instrumentation") {
+    // Include the test-only library on non-release builds.
+    if (variant.buildType == "release") {
       variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
+      variant.androidResources.ignoreAssetsPatterns.add("libsignal-testing.md")
     }
 
     // Starting with minSdk 23, Android leaves native libraries uncompressed, which is fine for the Play Store, but not for our self-distributed APKs.
@@ -726,6 +721,7 @@ dependencies {
   }
   implementation(libs.dnsjava)
   implementation(libs.kotlinx.collections.immutable)
+  implementation(libs.arrow.core)
   implementation(libs.accompanist.permissions)
   implementation(libs.accompanist.drawablepainter)
   implementation(libs.kotlin.stdlib.jdk8)
@@ -747,7 +743,7 @@ dependencies {
 
   "canaryImplementation"(libs.square.leakcanary)
 
-  "instrumentationImplementation"(libs.androidx.fragment.testing) {
+  androidTestImplementation(libs.androidx.fragment.testing) {
     exclude(group = "androidx.test", module = "core")
   }
 

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms
 
+import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.AndroidLogger
 import org.signal.core.util.logging.Log
@@ -11,6 +12,7 @@ import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDepende
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.testing.InMemoryLogger
+import org.thoughtcrime.securesms.util.Environment
 
 /**
  * Application context for running instrumentation tests (aka androidTests).
@@ -19,6 +21,11 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
 
   val inMemoryLogger: InMemoryLogger = InMemoryLogger()
 
+  override fun attachBaseContext(base: Context?) {
+    Environment.IS_INSTRUMENTATION = true
+    super.attachBaseContext(base)
+  }
+
   override fun initializeAppDependencies() {
     val default = ApplicationDependencyProvider(this)
     AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))

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

@@ -138,7 +138,7 @@ class ConversationItemPreviewer {
   private fun attachment(): SignalServiceAttachmentPointer {
     return SignalServiceAttachmentPointer(
       Cdn.CDN_3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from(""),
+      SignalServiceAttachmentRemoteId.from("", Cdn.CDN_3.cdnNumber),
       "image/webp",
       null,
       Optional.empty(),

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

@@ -75,6 +75,14 @@ class EditMessageSyncProcessorTest {
             .timestamp(originalTimestamp)
             .expirationStartTimestamp(originalTimestamp)
             .message(content.dataMessage)
+            .unidentifiedStatus(
+              listOf(
+                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder()
+                  .destinationServiceIdBinary(toRecipient.requireServiceId().toByteString())
+                  .unidentified(true)
+                  .build()
+              )
+            )
             .build()
         ).build()
       ).build()
@@ -100,6 +108,14 @@ class EditMessageSyncProcessorTest {
                 .targetSentTimestamp(originalTimestamp)
                 .build()
             )
+            .unidentifiedStatus(
+              listOf(
+                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder()
+                  .destinationServiceIdBinary(toRecipient.requireServiceId().toByteString())
+                  .unidentified(true)
+                  .build()
+              )
+            )
             .build()
         ).build()
       ).build()

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

@@ -13,7 +13,6 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isGreaterThan
 import assertk.assertions.isNotEqualTo
 import assertk.assertions.isNotNull
-import assertk.assertions.isNull
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
@@ -166,7 +165,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
     assertThat(messageCount).isEqualTo(0)
 
     val threadRecord = SignalDatabase.threads.getThreadRecord(threadId)
-    assertThat(threadRecord).isNull()
+    assertThat(threadRecord?.active).isEqualTo(false)
   }
 
   @Test
@@ -245,7 +244,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
   }
 
   @Test
@@ -304,7 +303,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
 
     harness.inMemoryLogger.flush()
     assertThat(harness.inMemoryLogger.entries().filter { it.message?.contains("Using backup non-expiring messages") == true }).hasSize(1)
@@ -344,7 +343,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
   }
 
   @Test
@@ -376,7 +375,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(3)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNotNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(true)
   }
 
   @Test
@@ -405,7 +404,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
   }
 
   @Test
@@ -435,7 +434,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
     // THEN
     threadIds.forEach {
       assertThat(SignalDatabase.messages.getMessageCountForThread(it)).isEqualTo(0)
-      assertThat(SignalDatabase.threads.getThreadRecord(it)).isNull()
+      assertThat(SignalDatabase.threads.getThreadRecord(it)?.active).isEqualTo(false)
     }
   }
 
@@ -463,7 +462,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(aliceThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)?.active).isEqualTo(false)
   }
 
   @Ignore("counts are consistent for some reason")
@@ -527,10 +526,10 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(aliceThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)?.active).isEqualTo(false)
 
     assertThat(SignalDatabase.messages.getMessageCountForThread(groupThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(groupThreadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(groupThreadId)?.active).isEqualTo(false)
   }
 
   @Test
@@ -551,7 +550,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
 
     // THEN
     assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(20)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNotNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(true)
 
     harness.inMemoryLogger.flush()
     assertThat(harness.inMemoryLogger.entries().filter { it.message?.contains("Thread is not local only") == true }).hasSize(1)
@@ -665,7 +664,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
     updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
     assertThat(updatedAttachments).isEmpty()
 
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
   }
 
   private fun DatabaseAttachment.copy(

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

@@ -8,9 +8,9 @@ package org.thoughtcrime.securesms.testing
 import androidx.test.platform.app.InstrumentationRegistry
 import io.mockk.every
 import org.junit.rules.ExternalResource
+import org.signal.core.util.JsonUtils
 import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
 
 /**

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

@@ -139,7 +139,7 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
       val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
       SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
       SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
+      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
       SignalDatabase.recipients.markRegistered(recipientId, aci)
       val otherIdentity = IdentityKeyPair.generate()

app/src/androidTest/java/org/thoughtcrime/securesms/testing/incomingmessageobserver/IncomingMessageObserverDependencyProvider.kt

@@ -2,13 +2,13 @@ package org.thoughtcrime.securesms.testing.incomingmessageobserver
 
 import android.app.Application
 import org.signal.benchmark.setup.NoOpJob
+import org.signal.core.util.UptimeSleepTimer
 import org.signal.libsignal.net.Network
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.jobmanager.JobManager
 import org.thoughtcrime.securesms.jobs.JobManagerFactories
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection

app/src/benchmark/java/org/thoughtcrime/securesms/BenchmarkApplicationContext.kt

@@ -7,13 +7,13 @@ package org.thoughtcrime.securesms
 
 import android.app.Application
 import org.signal.benchmark.setup.NoOpJob
+import org.signal.core.util.UptimeSleepTimer
 import org.signal.libsignal.net.Network
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.jobmanager.JobManager
 import org.thoughtcrime.securesms.jobs.JobManagerFactories
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection

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

@@ -146,7 +146,7 @@ object TestMessages {
   private fun imageAttachment(): SignalServiceAttachmentPointer {
     return SignalServiceAttachmentPointer(
       Cdn.S3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from(""),
+      SignalServiceAttachmentRemoteId.from("", Cdn.S3.cdnNumber),
       "image/webp",
       null,
       Optional.empty(),
@@ -170,7 +170,7 @@ object TestMessages {
   private fun voiceAttachment(): SignalServiceAttachmentPointer {
     return SignalServiceAttachmentPointer(
       Cdn.S3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from(""),
+      SignalServiceAttachmentRemoteId.from("", Cdn.S3.cdnNumber),
       "audio/aac",
       null,
       Optional.empty(),

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

@@ -133,7 +133,7 @@ object TestUsers {
         val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
         SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
         SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
+        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
         SignalDatabase.recipients.setProfileSharing(recipientId, true)
         SignalDatabase.recipients.markRegistered(recipientId, aci)
         val otherIdentity = IdentityKeyPair.generate()
@@ -157,7 +157,7 @@ object TestUsers {
         val recipientId = RecipientId.from(SignalServiceAddress(otherClient.serviceId, otherClient.e164))
         SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
         SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, otherClient.profileKey)
-        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
+        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
         SignalDatabase.recipients.setProfileSharing(recipientId, true)
         SignalDatabase.recipients.markRegistered(recipientId, otherClient.serviceId)
         AppDependencies.protocolStore.aci().saveIdentity(SignalProtocolAddress(otherClient.serviceId.toString(), 1), otherClient.identityKeyPair.publicKey)

app/src/benchmarkShared/java/org/whispersystems/signalservice/internal/websocket/BenchmarkWebSocketConnection.kt

@@ -11,7 +11,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject
 import org.signal.network.websocket.WebSocketRequestMessage
 import org.signal.network.websocket.WebSocketResponseMessage
 import org.signal.network.websocket.WebsocketResponse
-import org.thoughtcrime.securesms.util.JsonUtils
+import org.signal.core.util.JsonUtils
 import org.thoughtcrime.securesms.util.SignalTrace
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 import org.whispersystems.signalservice.internal.push.SendMessageResponse

app/src/instrumentation/AndroidManifest.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-    <application
-        android:usesCleartextTraffic="true"
-        tools:replace="android:usesCleartextTraffic"
-        tools:ignore="UnusedAttribute" />
-
-</manifest>

app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/signal_accent_green"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/instrumentation/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (Instrumentation)</string>
-</resources>

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

@@ -13,7 +13,8 @@ object AppCapabilities {
       storage = storageCapable,
       versionedExpirationTimer = true,
       attachmentBackfill = true,
-      spqr = true
+      spqr = true,
+      usernameChangeSyncMessage = false // TODO(michelle): Turn on once all clients support it and add a migration
     )
   }
 }

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

@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.Intent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -32,8 +33,10 @@ import net.zetetic.database.Logger;
 import org.conscrypt.ConscryptSignal;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
+import org.signal.core.util.AppForegroundObserver;
 import org.signal.core.util.DiskUtil;
 import org.signal.core.util.MemoryTracker;
+import org.signal.core.util.Util;
 import org.signal.core.util.concurrent.AnrDetector;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
@@ -50,6 +53,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupRepository;
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.LogDatabase;
+import org.thoughtcrime.securesms.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
@@ -58,6 +62,7 @@ import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmFetchManager;
 import org.thoughtcrime.securesms.glide.SignalGlideComponents;
+import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 import org.thoughtcrime.securesms.jobs.BackupRefreshJob;
 import org.thoughtcrime.securesms.jobs.BackupSubscriptionCheckJob;
@@ -74,6 +79,7 @@ import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.InAppPaymentAuthCheckJob;
 import org.thoughtcrime.securesms.jobs.InAppPaymentKeepAliveJob;
 import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
+import org.thoughtcrime.securesms.jobs.MessageSendLogCleanupJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
@@ -82,13 +88,14 @@ import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
-import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
 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.logsubmit.SubmitDebugLogActivity;
 import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver;
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.SignalGlideModule;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -104,10 +111,8 @@ import org.thoughtcrime.securesms.service.MessageBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
-import org.thoughtcrime.securesms.service.webrtc.CallingAssets;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -118,7 +123,6 @@ import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.SqlCipherLogTarget;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
@@ -226,7 +230,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
               .addPostRender(RefreshSvrCredentialsJob::enqueueIfNecessary)
               .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
               .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-              .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), RemoteConfig.retryRespondMaxAge()))
+              .addPostRender(MessageSendLogCleanupJob::enqueue)
               .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
               .addPostRender(RetrieveRemoteAnnouncementsJob::enqueue)
               .addPostRender(AndroidTelecomUtil::registerPhoneAccount)
@@ -417,7 +421,12 @@ public class ApplicationContext extends Application implements AppForegroundObse
       new org.signal.registration.RegistrationDependencies(
         new org.thoughtcrime.securesms.registration.v2.AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
         new org.thoughtcrime.securesms.registration.v2.AppRegistrationStorageController(this),
-        null
+        Environment.IS_LINK_AND_SYNC_AVAILABLE,
+        null,
+        context -> {
+          context.startActivity(new Intent(context, SubmitDebugLogActivity.class));
+          return Unit.INSTANCE;
+        }
       )
     );
   }
@@ -448,22 +457,27 @@ public class ApplicationContext extends Application implements AppForegroundObse
     PlayServicesUtil.PlayServicesStatus playServicesStatus = PlayServicesUtil.getPlayServicesStatus(this);
 
     if (playServicesStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS && !SignalStore.account().isFcmEnabled()) {
-      Log.i(TAG, "Play Services are newly-available. Enabling FCM and updating server.");
+      Log.w(TAG, "Play Services are newly-available. Enabling FCM and updating server.");
       SignalStore.account().setFcmEnabled(true);
       AppDependencies.getJobManager().startChain(new FcmRefreshJob())
                                       .then(new RefreshAttributesJob())
                                       .enqueue();
+      AppDependencies.resetNetwork();
+      AppDependencies.startNetwork();
+      IncomingMessageObserver.stopForegroundService(this);
     } else if (playServicesStatus == PlayServicesUtil.PlayServicesStatus.MISSING && SignalStore.account().isFcmEnabled()) {
-      Log.w(TAG, "Play Services are no longer available. Disabling FCM and updating server.");
-      SignalStore.account().setFcmEnabled(false);
-      SignalStore.account().setFcmToken(null);
-      AppDependencies.getJobManager().add(new RefreshAttributesJob());
+      Log.w(TAG, "Play Services are no longer available. Attempting to get an FCM token anyway.");
+      AppDependencies.getJobManager().add(new FcmRefreshJob());
+    } else if (playServicesStatus == PlayServicesUtil.PlayServicesStatus.MISSING && (System.currentTimeMillis() - SignalStore.misc().getLastMissingPlayServicesFcmVerificationTime()) > TimeUnit.DAYS.toMillis(3)) {
+      Log.i(TAG, "Play Services are unavailable, but it's been long enough that we should check and see if we can get an FCM token anyway.");
+      AppDependencies.getJobManager().add(new FcmRefreshJob());
     } else if (SignalStore.account().isFcmEnabled()) {
       long lastSetTime = SignalStore.account().getFcmTokenLastSetTime();
       long nextSetTime = lastSetTime + TimeUnit.HOURS.toMillis(6);
       long now         = System.currentTimeMillis();
 
       if (SignalStore.account().getFcmToken() == null || nextSetTime <= now || lastSetTime > now) {
+        Log.i(TAG, "Time for routine FCM token refresh.");
         AppDependencies.getJobManager().add(new FcmRefreshJob());
       }
     } else {
@@ -498,6 +512,8 @@ public class ApplicationContext extends Application implements AppForegroundObse
     if (RemoteConfig.internalUser()) {
       Tracer.getInstance().setMaxBufferSize(35_000);
     }
+
+    SQLiteDatabase.setSlowWriteLoggingEnabled(RemoteConfig.slowDatabaseNotifications());
   }
 
   private void initializePeriodicTasks() {

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

@@ -16,7 +16,7 @@ import androidx.core.app.ActivityOptionsCompat;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.AppStartup;
-import org.thoughtcrime.securesms.util.ConfigurationUtil;
+import org.signal.core.util.ConfigurationUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 

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

@@ -6,7 +6,7 @@ import androidx.lifecycle.LifecycleOwner;
 import com.bumptech.glide.RequestManager;
 
 import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
-import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.database.model.ThreadWithRecipient;
 
 import java.util.Locale;
 import java.util.Set;
@@ -14,7 +14,7 @@ import java.util.Set;
 public interface BindableConversationListItem extends Unbindable {
 
   void bind(@NonNull LifecycleOwner lifecycleOwner,
-            @NonNull ThreadRecord thread,
+            @NonNull ThreadWithRecipient thread,
             @NonNull RequestManager requestManager, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
             @NonNull ConversationSet selectedConversations,

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

@@ -10,8 +10,8 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.biometric.BiometricPrompt.PromptInfo
+import org.signal.core.util.ServiceUtil
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.util.ServiceUtil
 
 /**
  * Authentication using phone biometric (face, fingerprint recognition) or device lock (pattern, pin or passphrase).

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

@@ -23,45 +23,25 @@ public final class BlockUnblockDialog {
   private BlockUnblockDialog() {}
 
   public static void showReportSpamFor(@NonNull Context context,
-                                       @NonNull Lifecycle lifecycle,
                                        @NonNull Recipient recipient,
                                        @NonNull Runnable onReportSpam,
                                        @Nullable Runnable onBlockAndReportSpam)
   {
-    SimpleTask.run(lifecycle,
-                   () -> buildReportSpamFor(context, recipient, onReportSpam, onBlockAndReportSpam),
-                   AlertDialog.Builder::show);
+    buildReportSpamFor(context, recipient, onReportSpam, onBlockAndReportSpam).show();
   }
 
   public static void showBlockFor(@NonNull Context context,
-                                  @NonNull Lifecycle lifecycle,
                                   @NonNull Recipient recipient,
                                   @NonNull Runnable onBlock)
   {
-    SimpleTask.run(lifecycle,
-                   () -> buildBlockFor(context, recipient, onBlock, null),
-                   AlertDialog.Builder::show);
-  }
-
-  public static void showBlockAndReportSpamFor(@NonNull Context context,
-                                               @NonNull Lifecycle lifecycle,
-                                               @NonNull Recipient recipient,
-                                               @NonNull Runnable onBlock,
-                                               @NonNull Runnable onBlockAndReportSpam)
-  {
-    SimpleTask.run(lifecycle,
-                   () -> buildBlockFor(context, recipient, onBlock, onBlockAndReportSpam),
-                   AlertDialog.Builder::show);
+    buildBlockFor(context, recipient, onBlock, null).show();
   }
 
   public static void showUnblockFor(@NonNull Context context,
-                                    @NonNull Lifecycle lifecycle,
                                     @NonNull Recipient recipient,
                                     @NonNull Runnable onUnblock)
   {
-    SimpleTask.run(lifecycle,
-                   () -> buildUnblockFor(context, recipient, onUnblock),
-                   AlertDialog.Builder::show);
+    buildUnblockFor(context, recipient, onUnblock).show();
   }
 
   @WorkerThread

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

@@ -87,6 +87,7 @@ import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.ui.permissions.Permissions
 import org.signal.core.ui.rememberIsSplitPane
+import org.signal.core.util.AppForegroundObserver
 import org.signal.core.util.Util
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.getParcelableCompat
@@ -179,7 +180,6 @@ import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.stories.archive.StoryArchiveActivity
 import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment
 import org.thoughtcrime.securesms.stories.settings.StorySettingsActivity
-import org.thoughtcrime.securesms.util.AppForegroundObserver
 import org.thoughtcrime.securesms.util.AppStartup
 import org.thoughtcrime.securesms.util.CachedInflater
 import org.thoughtcrime.securesms.util.CommunicationActions

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

@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.restore.RestoreActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.AppForegroundObserver;
+import org.signal.core.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 

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

@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInstaller
 import android.os.Build
+import org.signal.core.util.AppForegroundObserver
 import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.StreamUtil
 import org.signal.core.util.getDownloadManager
@@ -18,7 +19,6 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ApkUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.AppForegroundObserver
 import org.thoughtcrime.securesms.util.FileUtils
 import java.io.FileInputStream
 import java.io.IOException

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

@@ -12,12 +12,12 @@ 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.ServiceUtil
 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 {
 

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

@@ -10,11 +10,11 @@ import android.os.Parcelable
 import androidx.core.os.ParcelCompat
 import org.signal.blurhash.BlurHash
 import org.signal.core.models.media.TransformProperties
+import org.signal.core.util.ParcelUtil
 import org.signal.core.util.UuidUtil
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.ParcelUtil
 import java.util.UUID
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds

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

@@ -31,7 +31,7 @@ fun Attachment.toAttachmentPointer(context: Context): AttachmentPointer? {
   }
 
   try {
-    val remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation!!)
+    val remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation!!, attachment.cdn.cdnNumber)
 
     var attachmentWidth = attachment.width
     var attachmentHeight = attachment.height

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

@@ -5,11 +5,11 @@ import android.os.Parcel
 import androidx.core.os.ParcelCompat
 import org.signal.blurhash.BlurHash
 import org.signal.core.models.media.TransformProperties
+import org.signal.core.util.ParcelUtil
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.ParcelUtil
 import java.util.UUID
 
 class DatabaseAttachment : Attachment {

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

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.thoughtcrime.securesms.util.ParcelUtil;
+import org.signal.core.util.ParcelUtil;
 import org.signal.core.util.Base64;
 
 import java.io.IOException;

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

@@ -7,7 +7,7 @@ import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
 import android.os.Build
 import androidx.annotation.RequiresApi
-import org.thoughtcrime.securesms.util.ServiceUtil
+import org.signal.core.util.ServiceUtil
 
 abstract class AudioRecorderFocusManager(val context: Context) {
   protected val audioManager: AudioManager = ServiceUtil.getAudioManager(context)

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarPickerStorage.kt

@@ -38,8 +38,8 @@ object AvatarPickerStorage {
       .getAllAvatars()
       .filterIsInstance<Avatar.Photo>()
 
-    val inDatabaseFileNames = photoAvatars.map { PartAuthority.getAvatarPickerFilename(it.uri) }
-    val onDiskFileNames = avatarFiles.map { it.name }
+    val inDatabaseFileNames = photoAvatars.mapTo(mutableSetOf()) { PartAuthority.getAvatarPickerFilename(it.uri) }
+    val onDiskFileNames = avatarFiles.mapTo(mutableSetOf()) { it.name }
 
     val inDatabaseButNotOnDisk = inDatabaseFileNames - onDiskFileNames
     val onDiskButNotInDatabase = onDiskFileNames - inDatabaseFileNames

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

@@ -6,14 +6,18 @@
 package org.thoughtcrime.securesms.backup
 
 import androidx.annotation.WorkerThread
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.withContext
 import org.signal.core.util.bytes
 import org.signal.core.util.logging.Log
@@ -46,6 +50,8 @@ object ArchiveUploadProgress {
 
   private val TAG = Log.tag(ArchiveUploadProgress::class)
 
+  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
   private val _progress: MutableSharedFlow<Unit> = MutableSharedFlow(replay = 1)
 
   private var uploadProgress: ArchiveUploadProgressState = SignalStore.backup.archiveUploadState ?: ArchiveUploadProgressState(
@@ -61,7 +67,7 @@ object ArchiveUploadProgress {
   /**
    * Observe this to get updates on the current upload progress.
    */
-  val progress: Flow<ArchiveUploadProgressState> = _progress
+  val progress: SharedFlow<ArchiveUploadProgressState> = _progress
     .throttleLatest(500.milliseconds) {
       uploadProgress.state == ArchiveUploadProgressState.State.None ||
         (uploadProgress.state == ArchiveUploadProgressState.State.UploadBackupFile && uploadProgress.backupFileUploadedBytes == 0L) ||
@@ -114,6 +120,11 @@ object ArchiveUploadProgress {
     }
     .onStart { emit(uploadProgress) }
     .flowOn(Dispatchers.IO)
+    .shareIn(scope, SharingStarted.Eagerly, replay = 1)
+
+  init {
+    _progress.tryEmit(Unit)
+  }
 
   val inProgress
     get() = uploadProgress.state != ArchiveUploadProgressState.State.None && uploadProgress.state != ArchiveUploadProgressState.State.UserCanceled

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveDatabaseExecutor.kt

@@ -6,8 +6,8 @@
 package org.thoughtcrime.securesms.backup.v2
 
 import androidx.annotation.VisibleForTesting
+import org.signal.core.util.ThrottledDebouncer
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.util.ThrottledDebouncer
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
 import kotlin.time.Duration.Companion.seconds

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveRestoreProgress.kt

@@ -31,6 +31,9 @@ import org.thoughtcrime.securesms.jobmanager.impl.BatteryNotLowConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.DiskSpaceNotLowConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.WifiConstraint
+import org.thoughtcrime.securesms.jobs.CheckRestoreMediaLeftJob
+import org.thoughtcrime.securesms.jobs.RestoreAttachmentJob
+import org.thoughtcrime.securesms.jobs.RestoreLocalAttachmentJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
@@ -157,6 +160,22 @@ object ArchiveRestoreProgress {
     update()
   }
 
+  /**
+   * Self-heal hook for restores that appear active (banner showing, media still remaining) but have no jobs left actually working on them.
+   */
+  fun checkForStalledRestore() {
+    SignalExecutors.BOUNDED.execute {
+      val stalled = SignalStore.backup.restoreState.isMediaRestoreOperation &&
+        SignalDatabase.attachments.getRemainingRestorableAttachmentSize() > 0L &&
+        AppDependencies.jobManager.areFactoriesEmpty(setOf(RestoreAttachmentJob.KEY, RestoreLocalAttachmentJob.KEY, CheckRestoreMediaLeftJob.KEY))
+
+      if (stalled) {
+        Log.w(TAG, "Detected a stalled media restore with no active jobs. Enqueueing a check job to recover.")
+        CheckRestoreMediaLeftJob.enqueueStalledRecoveryCheck()
+      }
+    }
+  }
+
   fun clearLocalRestoreDirectoryError() {
     SignalStore.backup.localRestoreDirectoryError = false
     update()

app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt

@@ -40,6 +40,7 @@ import org.signal.core.util.CursorUtil
 import org.signal.core.util.DiskUtil
 import org.signal.core.util.EventTimer
 import org.signal.core.util.PendingIntentFlags.cancelCurrent
+import org.signal.core.util.ServiceUtil
 import org.signal.core.util.Stopwatch
 import org.signal.core.util.bytes
 import org.signal.core.util.concurrent.LimitedWorker
@@ -147,7 +148,6 @@ import org.thoughtcrime.securesms.service.BackupMediaRestoreService
 import org.thoughtcrime.securesms.service.BackupProgressService
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.toMillis
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
@@ -1465,6 +1465,7 @@ object BackupRepository {
     }
 
     SignalDatabase.remappedRecords.clearCache()
+    SignalDatabase.remappedRecords.trimStaleMappings()
     AppDependencies.recipientCache.clear()
     AppDependencies.recipientCache.warmUp()
     SignalDatabase.threads.clearCache()

app/src/main/java/org/thoughtcrime/securesms/backup/v2/DatabaseAttachmentArchiveUtil.kt

@@ -123,7 +123,7 @@ fun DatabaseAttachment.createArchiveAttachmentPointer(useArchiveCdn: Boolean): S
         throw InvalidAttachmentException("empty content id")
       }
 
-      SignalServiceAttachmentRemoteId.from(remoteLocation) to cdn.cdnNumber
+      SignalServiceAttachmentRemoteId.from(remoteLocation, cdn.cdnNumber) to cdn.cdnNumber
     }
 
     val key = Base64.decode(remoteKey)

app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatArchiveExporter.kt

@@ -61,7 +61,7 @@ class ChatArchiveExporter(private val cursor: Cursor, private val db: SignalData
       expirationTimerMs = cursor.requireLong(RecipientTable.MESSAGE_EXPIRATION_TIME).seconds.inWholeMilliseconds.takeIf { it > 0 },
       expireTimerVersion = cursor.requireInt(RecipientTable.MESSAGE_EXPIRATION_TIME_VERSION),
       muteUntilMs = cursor.requireLong(RecipientTable.MUTE_UNTIL).takeIf { it > 0 },
-      markedUnread = ThreadTable.ReadStatus.deserialize(cursor.requireInt(ThreadTable.READ)) == ThreadTable.ReadStatus.FORCED_UNREAD,
+      markedUnread = ThreadTable.ReadStatus.deserialize(cursor.requireInt(ThreadTable.READ)) == ThreadTable.ReadStatus.ForcedUnread,
       dontNotifyForMentionsIfMuted = RecipientTable.NotificationSetting.DO_NOT_NOTIFY.id == cursor.requireInt(RecipientTable.MENTION_SETTING),
       style = ChatStyleConverter.constructRemoteChatStyle(
         db = db,

app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt

@@ -45,6 +45,7 @@ import org.signal.core.models.ServiceId
 import org.signal.core.util.Base64
 import org.signal.core.util.EventTimer
 import org.signal.core.util.Hex
+import org.signal.core.util.JsonUtils
 import org.signal.core.util.ParallelEventTimer
 import org.signal.core.util.StringUtil
 import org.signal.core.util.UuidUtil
@@ -105,7 +106,6 @@ import org.thoughtcrime.securesms.payments.FailureReason
 import org.thoughtcrime.securesms.payments.State
 import org.thoughtcrime.securesms.polls.PollRecord
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.JsonUtils
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.mb
 import java.io.Closeable

app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt

@@ -46,7 +46,7 @@ object ChatArchiveImporter {
         ThreadTable.RECIPIENT_ID to recipientId.serialize(),
         ThreadTable.PINNED_ORDER to chat.pinnedOrder,
         ThreadTable.ARCHIVED to chat.archived.toInt(),
-        ThreadTable.READ to if (chat.markedUnread) ThreadTable.ReadStatus.FORCED_UNREAD.serialize() else ThreadTable.ReadStatus.READ.serialize(),
+        ThreadTable.READ to if (chat.markedUnread) ThreadTable.ReadStatus.ForcedUnread.serialize() else ThreadTable.ReadStatus.Read.serialize(),
         ThreadTable.ACTIVE to 1
       )
       .run()

app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt

@@ -27,6 +27,7 @@ import org.signal.archive.proto.ViewOnceMessage
 import org.signal.core.models.ServiceId
 import org.signal.core.util.Base64
 import org.signal.core.util.Hex
+import org.signal.core.util.JsonUtils
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.UuidUtil
 import org.signal.core.util.asList
@@ -81,7 +82,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.thoughtcrime.securesms.util.Environment
-import org.thoughtcrime.securesms.util.JsonUtils
 import org.thoughtcrime.securesms.util.MessageUtil
 import org.whispersystems.signalservice.api.payments.Money
 import org.whispersystems.signalservice.internal.push.DataMessage

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt

@@ -52,6 +52,7 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.theme.SignalTheme
+import org.signal.core.util.ByteUnit
 import org.signal.core.util.billing.BillingResponseCode
 import org.signal.core.util.bytes
 import org.signal.core.util.money.FiatMoney
@@ -60,7 +61,6 @@ import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
 import org.thoughtcrime.securesms.fonts.SignalSymbols
 import org.thoughtcrime.securesms.fonts.SignalSymbols.signalSymbolText
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
-import org.thoughtcrime.securesms.util.ByteUnit
 import java.math.BigDecimal
 import java.util.Currency
 import kotlin.time.Duration.Companion.days

app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt

@@ -87,7 +87,7 @@ fun FilePointer?.toLocalAttachment(
     AttachmentType.TRANSIT -> {
       val signalAttachmentPointer = SignalServiceAttachmentPointer(
         cdnNumber = locatorInfo.transitCdnNumber ?: Cdn.CDN_0.cdnNumber,
-        remoteId = SignalServiceAttachmentRemoteId.from(locatorInfo.transitCdnKey!!),
+        remoteId = SignalServiceAttachmentRemoteId.from(locatorInfo.transitCdnKey!!, locatorInfo.transitCdnNumber ?: Cdn.CDN_0.cdnNumber),
         contentType = contentType,
         key = locatorInfo.key.toByteArray(),
         size = Optional.ofNullable(locatorInfo.size),

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

@@ -13,6 +13,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
+import org.signal.core.util.Debouncer
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.getParcelableCompat
 import org.signal.core.util.money.FiatMoney
@@ -39,7 +40,6 @@ import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
-import org.thoughtcrime.securesms.util.Debouncer
 import org.thoughtcrime.securesms.util.activityViewModel
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate

app/src/main/java/org/thoughtcrime/securesms/banner/banners/ArchiveRestoreStatusBanner.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.onStart
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState.RestoreStatus
@@ -25,6 +26,7 @@ class ArchiveRestoreStatusBanner(private val listener: RestoreProgressBannerList
   override val dataFlow: Flow<ArchiveRestoreProgressState> by lazy {
     ArchiveRestoreProgress
       .stateFlow
+      .onStart { ArchiveRestoreProgress.checkForStalledRestore() }
       .filter {
         it.restoreStatus != RestoreStatus.NONE && (it.restoreState.isMediaRestoreOperation || it.restoreStatus == RestoreStatus.FINISHED)
       }

app/src/main/java/org/thoughtcrime/securesms/banner/banners/DozeBanner.kt

@@ -14,13 +14,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
+import org.signal.core.util.ServiceUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.banner.Banner
 import org.thoughtcrime.securesms.banner.ui.compose.Action
 import org.thoughtcrime.securesms.banner.ui.compose.DefaultBanner
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.PowerManagerCompat
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class DozeBanner(private val context: Context, private val onDismissListener: () -> Unit) : Banner<Unit>() {

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersFragment.java

@@ -78,7 +78,7 @@ public class BlockedUsersFragment extends Fragment {
   }
 
   private void handleRecipientClicked(@NonNull Recipient recipient) {
-    BlockUnblockDialog.showUnblockFor(requireContext(), getViewLifecycleOwner().getLifecycle(), recipient, () -> {
+    BlockUnblockDialog.showUnblockFor(requireContext(), recipient, () -> {
       viewModel.unblock(recipient.getId());
     });
   }

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

@@ -9,14 +9,14 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import org.signal.core.util.ThrottledDebouncer
+import org.signal.core.util.concurrent.SerialExecutor
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.webrtc.ActiveCallData
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.util.ThrottledDebouncer
-import org.thoughtcrime.securesms.util.concurrent.SerialExecutor
 import java.util.concurrent.Executor
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.seconds

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

@@ -21,7 +21,7 @@ import androidx.core.widget.TextViewCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.signal.core.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

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

@@ -13,7 +13,7 @@ import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.DrawableUtil;
+import org.signal.core.util.DrawableUtil;
 import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;

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

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.signal.core.util.ServiceUtil;
 
 public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKeyboardShownListener {
   private InputView current;

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

@@ -38,10 +38,12 @@ import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import org.signal.core.ui.view.Stub;
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.core.util.logging.Log;
+import org.signal.glide.decryptableuri.DecryptableUri;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.animation.AnimationStartListener;
@@ -63,7 +65,6 @@ import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.keyboard.KeyboardPage;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
-import org.signal.glide.decryptableuri.DecryptableUri;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
@@ -91,32 +92,33 @@ public class InputPanel extends ConstraintLayout
   private static final long QUOTE_REVEAL_DURATION_MILLIS = 150;
   private static final int  FADE_TIME                    = 150;
 
-  private RecyclerView    stickerSuggestion;
-  private QuoteView       quoteView;
-  private LinkPreviewView linkPreview;
-  private EmojiToggle     mediaKeyboard;
-  private ComposeText     composeText;
-  private ImageButton     quickCameraToggle;
-  private ImageButton     quickAudioToggle;
-  private AnimatingToggle buttonToggle;
-  private SendButton      sendButton;
-  private View            recordingContainer;
-  private View            recordLockCancel;
-  private View            composeContainer;
-  private View            editMessageCancel;
-  private ImageView       editMessageThumbnail;
-  private View            editMessageTitle;
-  private FrameLayout     composeTextContainer;
+  private RecyclerView          stickerSuggestion;
+  private Stub<QuoteView>       quoteViewStub;
+  private Stub<LinkPreviewView> linkPreviewStub;
+  private EmojiToggle           mediaKeyboard;
+  private ComposeText           composeText;
+  private ImageButton           quickCameraToggle;
+  private ImageButton           quickAudioToggle;
+  private AnimatingToggle       buttonToggle;
+  private SendButton            sendButton;
+  private View                  recordingContainer;
+  private View                  recordLockCancel;
+  private View                  composeContainer;
+  private View                  editMessageCancel;
+  private ImageView             editMessageThumbnail;
+  private View                  editMessageTitle;
+  private FrameLayout           composeTextContainer;
 
-  private MicrophoneRecorderView microphoneRecorderView;
-  private SlideToCancel          slideToCancel;
-  private RecordTime             recordTime;
-  private ValueAnimator          quoteAnimator;
-  private ValueAnimator          editMessageAnimator;
-  private VoiceNoteDraftView     voiceNoteDraftView;
+  private MicrophoneRecorderView   microphoneRecorderView;
+  private SlideToCancel            slideToCancel;
+  private RecordTime               recordTime;
+  private ValueAnimator            quoteAnimator;
+  private ValueAnimator            editMessageAnimator;
+  private Stub<VoiceNoteDraftView> voiceNoteDraftViewStub;
 
   private @Nullable Listener listener;
   private           boolean  emojiVisible;
+  private           boolean  wallpaperEnabled;
 
   private boolean hideForMessageRequestState;
   private boolean hideForGroupState;
@@ -127,6 +129,12 @@ public class InputPanel extends ConstraintLayout
   private ConversationStickerSuggestionAdapter stickerSuggestionAdapter;
   private MessageRecord                        messageToEdit;
 
+  private final Observer<VoiceNotePlaybackState> playbackStateObserverProxy = state -> {
+    if (voiceNoteDraftViewStub.resolved()) {
+      voiceNoteDraftViewStub.get().getPlaybackStateObserver().onChanged(state);
+    }
+  };
+
   public InputPanel(Context context) {
     super(context);
   }
@@ -143,12 +151,10 @@ public class InputPanel extends ConstraintLayout
   public void onFinishInflate() {
     super.onFinishInflate();
 
-    View quoteDismiss = findViewById(R.id.quote_dismiss_stub);
-
     this.composeContainer       = findViewById(R.id.compose_bubble);
     this.stickerSuggestion      = findViewById(R.id.input_panel_sticker_suggestion);
-    this.quoteView              = findViewById(R.id.quote_view);
-    this.linkPreview            = findViewById(R.id.link_preview);
+    this.quoteViewStub          = new Stub<>(findViewById(R.id.quote_view));
+    this.linkPreviewStub        = new Stub<>(findViewById(R.id.link_preview));
     this.mediaKeyboard          = findViewById(R.id.emoji_toggle);
     this.composeText            = findViewById(R.id.embedded_text_editor);
     this.composeTextContainer   = findViewById(R.id.embedded_text_editor_container);
@@ -158,7 +164,7 @@ public class InputPanel extends ConstraintLayout
     this.sendButton             = findViewById(R.id.send_button);
     this.recordingContainer     = findViewById(R.id.recording_container);
     this.recordLockCancel       = findViewById(R.id.record_cancel);
-    this.voiceNoteDraftView     = findViewById(R.id.voice_note_draft_view);
+    this.voiceNoteDraftViewStub = new Stub<>(findViewById(R.id.voice_note_draft_view_stub));
     this.slideToCancel          = new SlideToCancel(findViewById(R.id.slide_to_cancel));
     this.microphoneRecorderView = findViewById(R.id.recorder_view);
     this.microphoneRecorderView.setHandler(this);
@@ -175,14 +181,6 @@ public class InputPanel extends ConstraintLayout
     mediaKeyboard.setVisibility(View.VISIBLE);
     emojiVisible = true;
 
-    quoteDismiss.setOnClickListener(v -> clearQuote());
-
-    linkPreview.setCloseClickedListener(() -> {
-      if (listener != null) {
-        listener.onLinkPreviewCanceled();
-      }
-    });
-
     stickerSuggestionAdapter = new ConversationStickerSuggestionAdapter(Glide.with(this), this);
 
     stickerSuggestion.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
@@ -197,7 +195,6 @@ public class InputPanel extends ConstraintLayout
     this.listener = listener;
 
     mediaKeyboard.setOnClickListener(v -> listener.onEmojiToggle());
-    voiceNoteDraftView.setListener(listener);
 
     if (Camera.getNumberOfCameras() > 0) {
       quickCameraToggle.setOnClickListener(v -> listener.onQuickCameraToggleClicked());
@@ -214,34 +211,35 @@ public class InputPanel extends ConstraintLayout
                        @NonNull SlideDeck attachments,
                        @NonNull QuoteModel.Type quoteType)
   {
-    this.quoteView.setQuote(requestManager, id, author, body, false, attachments, null, quoteType, true, null);
+    QuoteView quoteView = requireQuoteView();
+
+    quoteView.setQuote(requestManager, id, author, body, false, attachments, null, quoteType, true, null);
     if (listener != null) {
-      this.quoteView.setOnClickListener(v -> listener.onQuoteClicked(id, author.getId()));
+      quoteView.setOnClickListener(v -> listener.onQuoteClicked(id, author.getId()));
     }
 
-    int originalHeight = this.quoteView.getVisibility() == VISIBLE ? this.quoteView.getMeasuredHeight()
-                                                                   : 0;
+    int originalHeight = quoteView.getVisibility() == VISIBLE ? quoteView.getMeasuredHeight() : 0;
 
-    this.quoteView.setVisibility(VISIBLE);
+    quoteView.setVisibility(VISIBLE);
 
     int maxWidth = composeContainer.getWidth();
     if (quoteView.getLayoutParams() instanceof MarginLayoutParams) {
       MarginLayoutParams layoutParams = (MarginLayoutParams) quoteView.getLayoutParams();
       maxWidth -= layoutParams.leftMargin + layoutParams.rightMargin;
     }
-    this.quoteView.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST), 0);
+    quoteView.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST), 0);
 
     if (quoteAnimator != null) {
       quoteAnimator.cancel();
     }
 
-    quoteAnimator = createHeightAnimator(quoteView, originalHeight, this.quoteView.getMeasuredHeight(), null);
+    quoteAnimator = createHeightAnimator(quoteView, originalHeight, quoteView.getMeasuredHeight(), null);
 
     quoteAnimator.start();
 
-    if (this.linkPreview.getVisibility() == View.VISIBLE) {
+    if (linkPreviewStub.getVisibility() == View.VISIBLE) {
       int cornerRadius = readDimen(R.dimen.message_corner_collapse_radius);
-      this.linkPreview.setCorners(cornerRadius, cornerRadius);
+      linkPreviewStub.get().setCorners(cornerRadius, cornerRadius);
     }
 
     if (listener != null) {
@@ -250,6 +248,12 @@ public class InputPanel extends ConstraintLayout
   }
 
   public void clearQuote() {
+    if (!quoteViewStub.resolved()) {
+      return;
+    }
+
+    QuoteView quoteView = quoteViewStub.get();
+
     if (quoteAnimator != null) {
       quoteAnimator.cancel();
     }
@@ -259,9 +263,9 @@ public class InputPanel extends ConstraintLayout
       public void onAnimationEnd(Animator animation) {
         quoteView.dismiss();
 
-        if (linkPreview.getVisibility() == View.VISIBLE) {
+        if (linkPreviewStub.getVisibility() == View.VISIBLE) {
           int cornerRadius = readDimen(R.dimen.message_corner_radius);
-          linkPreview.setCorners(cornerRadius, cornerRadius);
+          linkPreviewStub.get().setCorners(cornerRadius, cornerRadius);
         }
       }
     });
@@ -273,6 +277,20 @@ public class InputPanel extends ConstraintLayout
     }
   }
 
+  private @NonNull QuoteView requireQuoteView() {
+    boolean   wasResolved = quoteViewStub.resolved();
+    QuoteView quoteView   = quoteViewStub.get();
+    if (!wasResolved) {
+      quoteView.setWallpaperEnabled(wallpaperEnabled);
+      View quoteDismiss = quoteView.findViewById(R.id.quote_dismiss_stub);
+      if (quoteDismiss != null) {
+        quoteDismiss.setOnClickListener(v -> clearQuote());
+      }
+    }
+
+    return quoteView;
+  }
+
   private static ValueAnimator createHeightAnimator(@NonNull View view,
                                                     int originalHeight,
                                                     int finalHeight,
@@ -294,11 +312,12 @@ public class InputPanel extends ConstraintLayout
     return animator;
   }
 
-  public boolean hasSaveableContent() {
-    return getQuote().isPresent() || voiceNoteDraftView.getDraft() != null;
-  }
-
   public Optional<QuoteModel> getQuote() {
+    if (!quoteViewStub.resolved()) {
+      return Optional.empty();
+    }
+
+    QuoteView quoteView = quoteViewStub.get();
     if (quoteView.getQuoteId() > 0 && quoteView.getVisibility() == View.VISIBLE) {
       return Optional.of(new QuoteModel(quoteView.getQuoteId(),
                                         quoteView.getAuthor().getId(),
@@ -314,41 +333,53 @@ public class InputPanel extends ConstraintLayout
   }
 
   public boolean hasLinkPreview() {
-    return linkPreview.getVisibility() == View.VISIBLE;
+    return linkPreviewStub.getVisibility() == View.VISIBLE;
   }
 
   public void setLinkPreviewLoading() {
-    this.linkPreview.setVisibility(View.VISIBLE);
-    this.linkPreview.setLoading();
+    LinkPreviewView linkPreview = requireLinkPreview();
+    linkPreview.setVisibility(View.VISIBLE);
+    linkPreview.setLoading();
   }
 
   public void setLinkPreviewNoPreview(@Nullable LinkPreviewRepository.Error customError) {
-    this.linkPreview.setVisibility(View.VISIBLE);
-    this.linkPreview.setNoPreview(customError);
+    LinkPreviewView linkPreview = requireLinkPreview();
+    linkPreview.setVisibility(View.VISIBLE);
+    linkPreview.setNoPreview(customError);
   }
 
   public void setLinkPreview(@NonNull RequestManager requestManager, @NonNull Optional<LinkPreview> preview) {
     if (preview.isPresent()) {
-      this.linkPreview.setVisibility(View.VISIBLE);
-      this.linkPreview.setLinkPreview(requestManager, preview.get(), true);
+      LinkPreviewView linkPreview = requireLinkPreview();
+      linkPreview.setVisibility(View.VISIBLE);
+      linkPreview.setLinkPreview(requestManager, preview.get(), true);
     } else {
-      this.linkPreview.setVisibility(View.GONE);
+      linkPreviewStub.setVisibility(View.GONE);
     }
 
-    int cornerRadius = quoteView.getVisibility() == VISIBLE ? readDimen(R.dimen.message_corner_collapse_radius)
-                                                            : readDimen(R.dimen.message_corner_radius);
+    if (linkPreviewStub.resolved()) {
+      int cornerRadius = quoteViewStub.getVisibility() == VISIBLE ? readDimen(R.dimen.message_corner_collapse_radius) : readDimen(R.dimen.message_corner_radius);
+      linkPreviewStub.get().setCorners(cornerRadius, cornerRadius);
+    }
+  }
 
-    this.linkPreview.setCorners(cornerRadius, cornerRadius);
+  private @NonNull LinkPreviewView requireLinkPreview() {
+    boolean         wasResolved = linkPreviewStub.resolved();
+    LinkPreviewView view        = linkPreviewStub.get();
+
+    if (!wasResolved) {
+      view.setCloseClickedListener(() -> {
+        if (listener != null) listener.onLinkPreviewCanceled();
+      });
+    }
+
+    return view;
   }
 
   public void clickOnComposeInput() {
     composeText.performClick();
   }
 
-  public void setMediaKeyboard(@NonNull MediaKeyboard mediaKeyboard) {
-    this.mediaKeyboard.attach(mediaKeyboard);
-  }
-
   public void setStickerSuggestions(@NonNull List<StickerRecord> stickers) {
     stickerSuggestion.setVisibility(stickers.isEmpty() ? View.GONE : View.VISIBLE);
     stickerSuggestionAdapter.setStickers(stickers);
@@ -403,7 +434,10 @@ public class InputPanel extends ConstraintLayout
     quickCameraToggle.setColorFilter(iconTint);
     composeText.setTextColor(textColor);
     composeText.setHintTextColor(textHintColor);
-    quoteView.setWallpaperEnabled(enabled);
+    wallpaperEnabled = enabled;
+    if (quoteViewStub.resolved()) {
+      quoteViewStub.get().setWallpaperEnabled(enabled);
+    }
   }
 
   public void enterEditModeIfPossible(@NonNull RequestManager requestManager, @NonNull ConversationMessage conversationMessageToEdit, boolean fromDraft, boolean clearQuote) {
@@ -493,7 +527,9 @@ public class InputPanel extends ConstraintLayout
     if (messageToEdit != null) {
       composeText.setText("");
       messageToEdit = null;
-      quoteView.setMessageType(QuoteView.MessageType.PREVIEW);
+      if (quoteViewStub.resolved()) {
+        quoteViewStub.get().setMessageType(QuoteView.MessageType.PREVIEW);
+      }
       clearQuote();
     }
     updateEditModeUi();
@@ -647,7 +683,7 @@ public class InputPanel extends ConstraintLayout
   }
 
   public @NonNull Observer<VoiceNotePlaybackState> getPlaybackStateObserver() {
-    return voiceNoteDraftView.getPlaybackStateObserver();
+    return playbackStateObserverProxy;
   }
 
   public void setEnabled(boolean enabled) {
@@ -666,7 +702,7 @@ public class InputPanel extends ConstraintLayout
     future.addListener(new AssertedSuccessListener<Void>() {
       @Override
       public void onSuccess(Void result) {
-        if (voiceNoteDraftView.getDraft() == null) {
+        if (!voiceNoteDraftViewStub.resolved() || voiceNoteDraftViewStub.get().getDraft() == null) {
           fadeInNormalComposeViews();
         }
       }
@@ -680,10 +716,6 @@ public class InputPanel extends ConstraintLayout
     mediaKeyboard.setToMedia();
   }
 
-  public void setToIme() {
-    mediaKeyboard.setToIme();
-  }
-
   @Override
   public void onKeyEvent(KeyEvent keyEvent) {
     composeText.dispatchKeyEvent(keyEvent);
@@ -715,20 +747,35 @@ public class InputPanel extends ConstraintLayout
 
   public void setVoiceNoteDraft(@Nullable DraftTable.Draft voiceNoteDraft) {
     if (voiceNoteDraft != null) {
+      VoiceNoteDraftView voiceNoteDraftView = requireVoiceNoteDraft();
       voiceNoteDraftView.setDraft(voiceNoteDraft);
       voiceNoteDraftView.setVisibility(VISIBLE);
       hideNormalComposeViews();
       fadeIn(buttonToggle);
       buttonToggle.displayQuick(sendButton);
     } else {
-      voiceNoteDraftView.clearDraft();
-      ViewUtil.fadeOut(voiceNoteDraftView, FADE_TIME);
+      if (voiceNoteDraftViewStub.resolved()) {
+        VoiceNoteDraftView voiceNoteDraftView = voiceNoteDraftViewStub.get();
+        voiceNoteDraftView.clearDraft();
+        ViewUtil.fadeOut(voiceNoteDraftView, FADE_TIME);
+      }
       fadeInNormalComposeViews();
     }
   }
 
   public @Nullable DraftTable.Draft getVoiceNoteDraft() {
-    return voiceNoteDraftView.getDraft();
+    if (!voiceNoteDraftViewStub.resolved()) return null;
+    return voiceNoteDraftViewStub.get().getDraft();
+  }
+
+  private @NonNull VoiceNoteDraftView requireVoiceNoteDraft() {
+    boolean            wasResolved        = voiceNoteDraftViewStub.resolved();
+    VoiceNoteDraftView voiceNoteDraftView = voiceNoteDraftViewStub.get();
+    if (!wasResolved) {
+      voiceNoteDraftView.setListener(listener);
+    }
+
+    return voiceNoteDraftView;
   }
 
   private void hideNormalComposeViews() {

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

@@ -30,7 +30,7 @@ import androidx.appcompat.widget.LinearLayoutCompat;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.signal.core.util.ServiceUtil;
 import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

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

@@ -4,8 +4,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,9 +41,6 @@ import okhttp3.HttpUrl;
  */
 public class LinkPreviewView extends FrameLayout {
 
-  private static final String STATE_ROOT = "linkPreviewView.state.root";
-  private static final String STATE_STATE = "linkPreviewView.state.state";
-
   private static final int TYPE_CONVERSATION = 0;
   private static final int TYPE_COMPOSE      = 1;
 
@@ -114,30 +109,6 @@ public class LinkPreviewView extends FrameLayout {
     setWillNotDraw(false);
   }
 
-  @Override
-  protected @NonNull Parcelable onSaveInstanceState() {
-    Parcelable root   = super.onSaveInstanceState();
-    Bundle     bundle = new Bundle();
-
-    bundle.putParcelable(STATE_ROOT, root);
-    bundle.putParcelable(STATE_STATE, thumbnailState);
-
-    return bundle;
-  }
-
-  @Override
-  protected void onRestoreInstanceState(Parcelable state) {
-    if (state instanceof Bundle) {
-      Parcelable root = ((Bundle) state).getParcelable(STATE_ROOT);
-      thumbnailState = ((Bundle) state).getParcelable(STATE_STATE);
-
-      thumbnailState.applyState(thumbnail);
-      super.onRestoreInstanceState(root);
-    } else {
-      super.onRestoreInstanceState(state);
-    }
-  }
-
   @Override
   protected void dispatchDraw(Canvas canvas) {
     super.dispatchDraw(canvas);
@@ -251,7 +222,7 @@ public class LinkPreviewView extends FrameLayout {
       thumbnailState.applyState(thumbnail);
     } else {
       cornerMask.setRadii(topStart, topEnd, 0, 0);
-      thumbnailState.copy(
+      thumbnailState = thumbnailState.copy(
           topStart,
           defaultRadius,
           defaultRadius,

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

@@ -434,6 +434,7 @@ public class QuoteView extends ConstraintLayout implements RecipientForeverObser
 
     if (TextUtils.isEmpty(quoteTargetContentType)) {
       thumbnailView.setVisibility(GONE);
+      attachmentVideoOVerlayStub.setVisibility(GONE);
       attachmentNameViewStub.setVisibility(GONE);
 
       if (dismissStub.resolved()) {

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

@@ -12,8 +12,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.progressindicator.CircularProgressIndicator
+import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.padding
+import org.thoughtcrime.securesms.util.visible
 
 /**
  * Wraps a normal progress dialog for showing blocking in-progress UI.
@@ -81,9 +84,15 @@ class SignalProgressDialog private constructor(
       val progressView: CircularProgressIndicator = customView.findViewById(R.id.progress_dialog_progressbar)
 
       titleView.text = title
+      titleView.visible = title != null
       messageView.text = message
+      messageView.visible = message != null
       progressView.isIndeterminate = indeterminate
 
+      if (title == null && message == null) {
+        progressView.padding(top = 32.dp, bottom = 32.dp)
+      }
+
       builder.setView(customView)
       val dialog = builder.show()
 

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

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.signal.core.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.signal.core.util.Util;
 

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

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiHeader;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiNoResultsModel;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
-import org.thoughtcrime.securesms.util.DrawableUtil;
+import org.signal.core.util.DrawableUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
 

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

@@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.JsonUtils;
+import org.signal.core.util.JsonUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt

@@ -6,9 +6,9 @@ import android.text.Spanned
 import android.text.TextUtils
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
+import org.signal.core.util.ThrottledDebouncer
 import org.thoughtcrime.securesms.components.spoiler.SpoilerRendererDelegate
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.ThrottledDebouncer
 import java.util.Optional
 
 open class SimpleEmojiTextView @JvmOverloads constructor(

app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java

@@ -13,7 +13,7 @@ import com.google.android.gms.maps.model.LatLng;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.maps.AddressData;
-import org.thoughtcrime.securesms.util.JsonUtils;
+import org.signal.core.util.JsonUtils;
 
 import java.io.IOException;
 

app/src/main/java/org/thoughtcrime/securesms/components/mention/MentionRendererDelegate.java

@@ -14,7 +14,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
 import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.spoiler.SpoilerAnnotation;
-import org.thoughtcrime.securesms.util.DrawableUtil;
+import org.signal.core.util.DrawableUtil;
 import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 

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

@@ -81,6 +81,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SignalE164Util
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.signal.core.ui.R as CoreUiR
 
 class AppSettingsFragment : ComposeFragment(), Callbacks {
 
@@ -295,7 +296,7 @@ private fun AppSettingsContent(
           item {
             Rows.TextRow(
               text = stringResource(R.string.AccountSettingsFragment__account),
-              icon = painterResource(R.drawable.symbol_person_circle_24),
+              icon = painterResource(CoreUiR.drawable.symbol_person_circle_24),
               onClick = {
                 callbacks.navigate(AppSettingsRoute.AccountRoute.Account)
               }
@@ -305,7 +306,7 @@ private fun AppSettingsContent(
           item {
             Rows.TextRow(
               text = stringResource(R.string.preferences__linked_devices),
-              icon = painterResource(R.drawable.symbol_devices_24),
+              icon = painterResource(CoreUiR.drawable.symbol_devices_24),
               onClick = {
                 callbacks.navigate(AppSettingsRoute.LinkDeviceRoute.LinkDevice)
               },

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

@@ -45,6 +45,7 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.Texts
+import org.signal.core.util.ServiceUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
@@ -56,7 +57,6 @@ import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
 import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.PlayStoreUtil
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.whispersystems.signalservice.api.kbs.PinHashUtil

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt

@@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.JsonUtils
 import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.util.JsonUtils
 
 class ExportAccountDataRepository {
 

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

@@ -242,7 +242,7 @@ private fun BackupsSettingsContent(
       item {
         Rows.TextRow(
           text = stringResource(R.string.RemoteBackupsSettingsFragment__on_device_backups),
-          icon = ImageVector.vectorResource(R.drawable.symbol_device_phone_24),
+          icon = ImageVector.vectorResource(CoreUiR.drawable.symbol_device_phone_24),
           label = stringResource(R.string.RemoteBackupsSettingsFragment__save_your_backups_to),
           onClick = onOnDeviceBackupsRowClick
         )

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

@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.signal.core.util.ThrottledDebouncer
 import org.thoughtcrime.securesms.backup.LocalExportProgress
 import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFoldersRepository
 import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -17,7 +18,6 @@ import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.thoughtcrime.securesms.util.ThrottledDebouncer
 
 class ChatsSettingsViewModel @JvmOverloads constructor(
   private val repository: ChatsSettingsRepository = ChatsSettingsRepository()

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

@@ -17,6 +17,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import org.signal.core.ui.compose.ComposeFragment
 import org.signal.core.ui.compose.DayNightPreviews
+import org.signal.core.ui.compose.Dialogs
 import org.signal.core.ui.compose.Dividers
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
@@ -90,6 +91,18 @@ class DataAndStorageSettingsFragment : ComposeFragment() {
     override fun onRoamingDataAutoDownloadSelectionChanged(selection: Array<String>) {
       viewModel.setRoamingAutoDownloadValues(selection.toSet())
     }
+
+    override fun onForceWebsocketModeChanged(enabled: Boolean) {
+      viewModel.onForceWebsocketModeToggled(enabled)
+    }
+
+    override fun onConfirmStayConnectedInBackground() {
+      viewModel.confirmStayConnectedInBackground()
+    }
+
+    override fun onDismissStayConnectedInBackgroundDialog() {
+      viewModel.dismissStayConnectedInBackgroundDialog()
+    }
   }
 }
 
@@ -102,6 +115,9 @@ private interface DataAndStorageSettingsCallbacks {
   fun onMobileDataAutoDownloadSelectionChanged(selection: Array<String>) = Unit
   fun onWifiDataAutoDownloadSelectionChanged(selection: Array<String>) = Unit
   fun onRoamingDataAutoDownloadSelectionChanged(selection: Array<String>) = Unit
+  fun onForceWebsocketModeChanged(enabled: Boolean) = Unit
+  fun onConfirmStayConnectedInBackground() = Unit
+  fun onDismissStayConnectedInBackgroundDialog() = Unit
 
   object Empty : DataAndStorageSettingsCallbacks
 }
@@ -252,6 +268,19 @@ private fun DataAndStorageSettingsScreen(
         Dividers.Default()
       }
 
+      item {
+        Rows.ToggleRow(
+          checked = state.forceWebsocketMode || !state.playServicesAvailable,
+          text = stringResource(R.string.DataAndStorageSettingsFragment__stay_connected_in_background),
+          enabled = state.playServicesAvailable,
+          onCheckChanged = callbacks::onForceWebsocketModeChanged
+        )
+      }
+
+      item {
+        Dividers.Default()
+      }
+
       item {
         Texts.SectionHeader(stringResource(R.string.preferences_proxy))
       }
@@ -264,6 +293,17 @@ private fun DataAndStorageSettingsScreen(
         )
       }
     }
+
+    if (state.showStayConnectedDialog) {
+      Dialogs.SimpleAlertDialog(
+        title = "",
+        body = stringResource(R.string.DataAndStorageSettingsFragment__staying_connected_while_in_the_background_will_likely_result_in_increased_battery_usage),
+        confirm = stringResource(R.string.DataAndStorageSettingsFragment__enable),
+        dismiss = stringResource(android.R.string.cancel),
+        onConfirm = callbacks::onConfirmStayConnectedInBackground,
+        onDismiss = callbacks::onDismissStayConnectedInBackgroundDialog
+      )
+    }
   }
 }
 
@@ -279,7 +319,10 @@ private fun DataAndStorageSettingsScreenPreview() {
         roamingAutoDownloadValues = setOf(),
         callDataMode = CallDataMode.HIGH_ALWAYS,
         isProxyEnabled = false,
-        sentMediaQuality = SentMediaQuality.STANDARD
+        sentMediaQuality = SentMediaQuality.STANDARD,
+        forceWebsocketMode = false,
+        playServicesAvailable = true,
+        showStayConnectedDialog = false
       ),
       callbacks = DataAndStorageSettingsCallbacks.Empty
     )

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

@@ -10,5 +10,8 @@ data class DataAndStorageSettingsState(
   val roamingAutoDownloadValues: Set<String>,
   val callDataMode: CallDataMode,
   val isProxyEnabled: Boolean,
-  val sentMediaQuality: SentMediaQuality
+  val sentMediaQuality: SentMediaQuality,
+  val forceWebsocketMode: Boolean,
+  val playServicesAvailable: Boolean,
+  val showStayConnectedDialog: Boolean
 )

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

@@ -7,8 +7,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SettingsValues.ForceWebsocketMode
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver
 import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.webrtc.CallDataMode
 
@@ -23,7 +26,7 @@ class DataAndStorageSettingsViewModel(
 
   fun refresh() {
     repository.getTotalStorageUse { totalStorageUse ->
-      store.update { getState().copy(totalStorageUse = totalStorageUse) }
+      store.update { getState().copy(totalStorageUse = totalStorageUse, showStayConnectedDialog = it.showStayConnectedDialog) }
     }
   }
 
@@ -53,8 +56,34 @@ class DataAndStorageSettingsViewModel(
     getStateAndCopyStorageUsage()
   }
 
+  fun onForceWebsocketModeToggled(enabled: Boolean) {
+    if (enabled) {
+      store.update { it.copy(showStayConnectedDialog = true) }
+    } else {
+      applyForceWebsocketMode(false)
+    }
+  }
+
+  fun confirmStayConnectedInBackground() {
+    applyForceWebsocketMode(true)
+  }
+
+  fun dismissStayConnectedInBackgroundDialog() {
+    store.update { it.copy(showStayConnectedDialog = false) }
+  }
+
+  private fun applyForceWebsocketMode(enabled: Boolean) {
+    SignalStore.settings.forceWebsocketMode = if (enabled) ForceWebsocketMode.ENABLED_BY_USER else ForceWebsocketMode.DISABLED
+    if (!enabled) {
+      IncomingMessageObserver.stopForegroundService(AppDependencies.application)
+    }
+    AppDependencies.resetNetwork()
+    AppDependencies.startNetwork()
+    getStateAndCopyStorageUsage()
+  }
+
   private fun getStateAndCopyStorageUsage() {
-    store.update { getState().copy(totalStorageUse = it.totalStorageUse) }
+    store.update { getState().copy(totalStorageUse = it.totalStorageUse, showStayConnectedDialog = it.showStayConnectedDialog) }
   }
 
   private fun getState() = DataAndStorageSettingsState(
@@ -70,7 +99,10 @@ class DataAndStorageSettingsViewModel(
     ),
     callDataMode = SignalStore.settings.callDataMode,
     isProxyEnabled = SignalStore.proxy.isProxyEnabled,
-    sentMediaQuality = SignalStore.settings.sentMediaQuality
+    sentMediaQuality = SignalStore.settings.sentMediaQuality,
+    forceWebsocketMode = SignalStore.settings.forceWebsocketMode.isEnabled,
+    playServicesAvailable = PlayServicesUtil.getPlayServicesStatus(AppDependencies.application) == PlayServicesUtil.PlayServicesStatus.SUCCESS,
+    showStayConnectedDialog = false
   )
 
   class Factory(

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

@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.components.settings.app.help
 
+import android.widget.Toast
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -26,6 +27,7 @@ import org.signal.core.ui.compose.Rows.TextAndLabel
 import org.signal.core.ui.compose.Rows.defaultPadding
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
+import org.signal.core.util.Util
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.CommunicationActions
@@ -74,7 +76,11 @@ class HelpSettingsFragment : ComposeFragment() {
         item {
           Rows.TextRow(
             text = stringResource(R.string.HelpSettingsFragment__version),
-            label = BuildConfig.VERSION_NAME
+            label = BuildConfig.VERSION_NAME,
+            onLongClick = {
+              Util.copyToClipboard(context, BuildConfig.VERSION_NAME)
+              Toast.makeText(context, R.string.HelpSettingsFragment__copied_to_clipboard, Toast.LENGTH_SHORT).show()
+            }
           )
         }
 

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

@@ -6,9 +6,12 @@ import android.content.Context
 import android.content.DialogInterface
 import android.os.Build
 import android.os.Bundle
+import android.view.MenuItem
 import android.view.View
 import android.widget.EditText
 import android.widget.Toast
+import androidx.appcompat.widget.SearchView
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -74,8 +77,10 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.data.QuickstartCredentialExporter
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.ConversationUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.setIncognitoKeyboardEnabled
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents
 import java.util.Optional
 import java.util.UUID
@@ -83,15 +88,15 @@ import java.util.concurrent.TimeUnit
 import kotlin.math.max
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
 
-class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__internal_preferences) {
+class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__internal_preferences, R.menu.internal_settings) {
 
   companion object {
     private val TAG = Log.tag(InternalSettingsFragment::class.java)
   }
 
   private lateinit var viewModel: InternalSettingsViewModel
+  private var searchMenuItem: MenuItem? = null
 
   private var scrollToPosition: Int = 0
   private val layoutManager: LinearLayoutManager?
@@ -108,6 +113,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     scrollToPosition = SignalStore.internal.lastScrollPosition
+    initializeSearch(view)
 
     setFragmentResultListener(CallQualityBottomSheetFragment.REQUEST_KEY) { _, bundle ->
       if (bundle.getBoolean(CallQualityBottomSheetFragment.REQUEST_KEY, false)) {
@@ -126,8 +132,11 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
     viewModel = ViewModelProvider(this, factory)[InternalSettingsViewModel::class.java]
 
     viewModel.state.observe(viewLifecycleOwner) {
-      adapter.submitList(getConfiguration(it).toMappingModelList()) {
-        if (scrollToPosition != 0) {
+      val mappingModelList = getConfiguration(it).toMappingModelList()
+      val filteredList = viewModel.filterPreferences(requireContext(), mappingModelList, it.searchQuery)
+
+      adapter.submitList(filteredList) {
+        if (scrollToPosition != 0 && it.searchQuery.isBlank()) {
           layoutManager?.scrollToPositionWithOffset(scrollToPosition, 0)
           scrollToPosition = 0
         }
@@ -135,6 +144,56 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
     }
   }
 
+  override fun onToolbarNavigationClicked() {
+    if (searchMenuItem?.isActionViewExpanded == true) {
+      searchMenuItem?.collapseActionView()
+    } else {
+      super.onToolbarNavigationClicked()
+    }
+  }
+
+  private fun initializeSearch(view: View) {
+    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
+    searchMenuItem = toolbar.menu.findItem(R.id.menu_search)
+
+    val searchView: SearchView = searchMenuItem?.actionView as? SearchView ?: return
+    val queryListener = object : SearchView.OnQueryTextListener {
+      override fun onQueryTextSubmit(query: String?): Boolean {
+        searchView.clearFocus()
+        viewModel.setSearchQuery(query.orEmpty())
+        return true
+      }
+
+      override fun onQueryTextChange(newText: String?): Boolean {
+        viewModel.setSearchQuery(newText.orEmpty())
+        return true
+      }
+    }
+
+    searchView.maxWidth = Integer.MAX_VALUE
+    searchView.queryHint = getString(R.string.CameraContacts__menu_search)
+
+    searchMenuItem?.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+      override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+        searchView.setIncognitoKeyboardEnabled(TextSecurePreferences.isIncognitoKeyboardEnabled(requireContext()))
+        searchView.setOnQueryTextListener(queryListener)
+        return true
+      }
+
+      override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+        searchView.setOnQueryTextListener(null)
+        searchView.setQuery("", false)
+        viewModel.setSearchQuery("")
+        return true
+      }
+    })
+
+    val currentQuery = viewModel.state.value?.searchQuery.orEmpty()
+    if (currentQuery.isNotBlank() && searchMenuItem?.expandActionView() == true) {
+      searchView.setQuery(currentQuery, false)
+    }
+  }
+
   private fun getConfiguration(state: InternalSettingsState): DSLConfiguration {
     return configure {
       sectionHeaderPref(DSLSettingsText.from("Account"))
@@ -511,25 +570,6 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       sectionHeaderPref(DSLSettingsText.from("Network"))
 
-      switchPref(
-        title = DSLSettingsText.from("Force websocket mode"),
-        summary = DSLSettingsText.from("Pretend you have no Play Services. Ignores websocket messages and keeps the websocket open in a foreground service. You have to manually force-stop the app for changes to take effect."),
-        isChecked = state.forceWebsocketMode,
-        onClick = {
-          viewModel.setForceWebsocketMode(!state.forceWebsocketMode)
-          SimpleTask.run({
-            val jobState = AppDependencies.jobManager.runSynchronously(RefreshAttributesJob(), 10.seconds.inWholeMilliseconds)
-            return@run jobState.isPresent && jobState.get().isComplete
-          }, { success ->
-            if (success) {
-              Toast.makeText(context, "Successfully refreshed attributes. Force-stop the app for changes to take effect.", Toast.LENGTH_SHORT).show()
-            } else {
-              Toast.makeText(context, "Failed to refresh attributes.", Toast.LENGTH_SHORT).show()
-            }
-          })
-        }
-      )
-
       switchPref(
         title = DSLSettingsText.from("Allow censorship circumvention toggle"),
         summary = DSLSettingsText.from("Allow changing the censorship circumvention toggle regardless of network connectivity."),

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

@@ -10,7 +10,6 @@ data class InternalSettingsState(
   val gv2forceInvites: Boolean,
   val gv2ignoreP2PChanges: Boolean,
   val allowCensorshipSetting: Boolean,
-  val forceWebsocketMode: Boolean,
   val callingServer: String,
   val callingDataMode: CallManager.DataMode,
   val callingDisableTelecom: Boolean,
@@ -33,5 +32,6 @@ data class InternalSettingsState(
   val forceSplitPane: Boolean,
   val forceSinglePane: Boolean,
   val useNewMediaActivity: Boolean,
-  val disableInternalUser: Boolean
+  val disableInternalUser: Boolean,
+  val searchQuery: String = ""
 )

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

@@ -1,10 +1,14 @@
 package org.thoughtcrime.securesms.components.settings.app.internal
 
+import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.core.Observable
 import org.signal.ringrtc.CallManager
+import org.thoughtcrime.securesms.components.settings.DividerPreference
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.components.settings.SectionHeaderPreference
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob
 import org.thoughtcrime.securesms.keyvalue.InternalValues
@@ -12,7 +16,10 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList
 import org.thoughtcrime.securesms.util.livedata.Store
+import java.util.Locale
 
 class InternalSettingsViewModel(private val repository: InternalSettingsRepository) : ViewModel() {
   private val preferenceDataStore = SignalStore.getPreferenceDataStore()
@@ -70,11 +77,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
-  fun setForceWebsocketMode(enabled: Boolean) {
-    preferenceDataStore.putBoolean(InternalValues.FORCE_WEBSOCKET_MODE, enabled)
-    refresh()
-  }
-
   fun resetPnpInitializedState() {
     SignalStore.misc.hasPniInitializedDevices = false
     refresh()
@@ -172,7 +174,47 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
   }
 
   fun refresh() {
-    store.update { getState().copy(emojiVersion = it.emojiVersion) }
+    store.update { getState().copy(emojiVersion = it.emojiVersion, searchQuery = it.searchQuery) }
+  }
+
+  fun setSearchQuery(query: String) {
+    store.update {
+      if (it.searchQuery == query) {
+        it
+      } else {
+        it.copy(searchQuery = query)
+      }
+    }
+  }
+
+  fun filterPreferences(context: Context, items: MappingModelList, query: String): MappingModelList {
+    val normalizedQuery = query.trim().lowercase(Locale.getDefault())
+    if (normalizedQuery.isBlank()) {
+      return items
+    }
+
+    val groups = buildSearchGroups(items)
+    val filtered = MappingModelList()
+
+    groups.forEach { group ->
+      val headerMatches = group.header?.searchableText(context)?.contains(normalizedQuery) == true
+      val matchingItems = if (headerMatches) {
+        group.items
+      } else {
+        group.items.filter { it.searchableText(context)?.contains(normalizedQuery) == true }
+      }
+
+      if (headerMatches || matchingItems.isNotEmpty()) {
+        if (filtered.isNotEmpty() && group.divider != null) {
+          filtered.add(group.divider)
+        }
+
+        group.header?.let { filtered.add(it) }
+        filtered.addAll(matchingItems)
+      }
+    }
+
+    return filtered
   }
 
   private fun getState() = InternalSettingsState(
@@ -182,7 +224,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     gv2forceInvites = SignalStore.internal.gv2ForceInvites,
     gv2ignoreP2PChanges = SignalStore.internal.gv2IgnoreP2PChanges,
     allowCensorshipSetting = SignalStore.internal.allowChangingCensorshipSetting,
-    forceWebsocketMode = SignalStore.internal.isWebsocketModeForced,
     callingServer = SignalStore.internal.groupCallingServer,
     callingDataMode = SignalStore.internal.callingDataMode,
     callingDisableTelecom = SignalStore.internal.callingDisableTelecom,
@@ -231,6 +272,57 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
+  private fun buildSearchGroups(items: MappingModelList): List<SearchGroup> {
+    val groups = mutableListOf<SearchGroup>()
+    var divider: DividerPreference? = null
+    var header: SectionHeaderPreference? = null
+    var groupItems = mutableListOf<MappingModel<*>>()
+
+    fun flush() {
+      if (header != null || groupItems.isNotEmpty()) {
+        groups.add(SearchGroup(divider, header, groupItems))
+      }
+
+      divider = null
+      header = null
+      groupItems = mutableListOf()
+    }
+
+    items.forEach { item ->
+      when (item) {
+        is DividerPreference -> {
+          flush()
+          divider = item
+        }
+        is SectionHeaderPreference -> {
+          flush()
+          header = item
+        }
+        else -> groupItems.add(item)
+      }
+    }
+
+    flush()
+
+    return groups
+  }
+
+  private fun MappingModel<*>.searchableText(context: Context): String? {
+    return if (this is PreferenceModel<*>) {
+      listOfNotNull(title, summary)
+        .joinToString(separator = " ") { it.resolve(context).toString() }
+        .lowercase(Locale.getDefault())
+    } else {
+      null
+    }
+  }
+
+  private data class SearchGroup(
+    val divider: DividerPreference?,
+    val header: SectionHeaderPreference?,
+    val items: List<MappingModel<*>>
+  )
+
   class Factory(private val repository: InternalSettingsRepository) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(InternalSettingsViewModel(repository)))

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

@@ -54,7 +54,7 @@ import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.SignalIcons
-import org.thoughtcrime.securesms.database.model.ThreadRecord
+import org.thoughtcrime.securesms.database.model.ThreadWithRecipient
 
 class DataSeedingPlaygroundFragment : ComposeFragment() {
 
@@ -285,7 +285,7 @@ fun Screen(
 
 @Composable
 private fun ThreadSelectionRow(
-  thread: ThreadRecord,
+  thread: ThreadWithRecipient,
   isSelected: Boolean,
   onSelectionChanged: (Boolean) -> Unit
 ) {

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

@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.ThreadRecord
+import org.thoughtcrime.securesms.database.model.ThreadWithRecipient
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.util.MediaUtil
@@ -43,7 +43,7 @@ class DataSeedingPlaygroundViewModel(application: Application) : AndroidViewMode
   fun loadThreads() {
     viewModelScope.launch(Dispatchers.IO) {
       try {
-        val threads = mutableListOf<ThreadRecord>()
+        val threads = mutableListOf<ThreadWithRecipient>()
         val cursor: Cursor = SignalDatabase.threads.getRecentConversationList(
           limit = MAX_RECENT_THREADS,
           includeInactiveGroups = false,
@@ -213,7 +213,7 @@ class DataSeedingPlaygroundViewModel(application: Application) : AndroidViewMode
 }
 
 data class DataSeedingPlaygroundState(
-  val threads: List<ThreadRecord> = emptyList(),
+  val threads: List<ThreadWithRecipient> = emptyList(),
   val selectedThreads: Set<Long> = emptySet(),
   val mediaFiles: List<String> = emptyList(),
   val selectedFolderPath: String = ""

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

@@ -22,6 +22,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import org.signal.core.util.ServiceUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BiometricDeviceAuthentication
 import org.thoughtcrime.securesms.BiometricDeviceLockContract
@@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.ExpirationUtil
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt

@@ -45,6 +45,7 @@ import org.signal.core.ui.compose.Texts
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier
 import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.viewModel
 
 /**
@@ -298,29 +299,31 @@ private fun AdvancedPrivacySettingsScreen(
         )
       }
 
-      item {
-        Dividers.Default()
-      }
-
-      item {
-        val label = buildAnnotatedString {
-          append(stringResource(R.string.preferences_automatic_key_verification_body))
-          append(" ")
-          withLink(
-            LinkAnnotation.Clickable("learn-more", linkInteractionListener = {
-              callbacks.onAutomaticVerificationLearnMoreClick()
-            })
-          ) {
-            append(stringResource(R.string.LearnMoreTextView_learn_more))
-          }
+      if (RemoteConfig.internalUser) {
+        item {
+          Dividers.Default()
         }
 
-        Rows.ToggleRow(
-          checked = state.allowAutomaticKeyVerification,
-          text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)),
-          label = label,
-          onCheckChanged = callbacks::onAllowAutomaticVerificationChanged
-        )
+        item {
+          val label = buildAnnotatedString {
+            append(stringResource(R.string.preferences_automatic_key_verification_body))
+            append(" ")
+            withLink(
+              LinkAnnotation.Clickable("learn-more", linkInteractionListener = {
+                callbacks.onAutomaticVerificationLearnMoreClick()
+              })
+            ) {
+              append(stringResource(R.string.LearnMoreTextView_learn_more))
+            }
+          }
+
+          Rows.ToggleRow(
+            checked = state.allowAutomaticKeyVerification,
+            text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)),
+            label = label,
+            onCheckChanged = callbacks::onAllowAutomaticVerificationChanged
+          )
+        }
       }
     }
   }

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

@@ -162,11 +162,18 @@ class ManageDonationsViewModel : ViewModel() {
   private fun deriveRedemptionState(status: DonationRedemptionJobStatus, latestPayment: InAppPaymentTable.InAppPayment?): ManageDonationsState.RedemptionState {
     return when (status) {
       DonationRedemptionJobStatus.None -> ManageDonationsState.RedemptionState.NONE
-      DonationRedemptionJobStatus.PendingKeepAlive -> ManageDonationsState.RedemptionState.SUBSCRIPTION_REFRESH
       DonationRedemptionJobStatus.FailedSubscription -> ManageDonationsState.RedemptionState.FAILED
 
+      DonationRedemptionJobStatus.PendingKeepAlive -> {
+        if (latestPayment.isPendingBankTransfer()) {
+          ManageDonationsState.RedemptionState.IS_PENDING_BANK_TRANSFER
+        } else {
+          ManageDonationsState.RedemptionState.SUBSCRIPTION_REFRESH
+        }
+      }
+
       is DonationRedemptionJobStatus.PendingExternalVerification -> {
-        if (latestPayment != null && (latestPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.SEPA_DEBIT || latestPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.IDEAL)) {
+        if (latestPayment.isPendingBankTransfer()) {
           ManageDonationsState.RedemptionState.IS_PENDING_BANK_TRANSFER
         } else {
           ManageDonationsState.RedemptionState.IN_PROGRESS
@@ -178,6 +185,10 @@ class ManageDonationsViewModel : ViewModel() {
     }
   }
 
+  private fun InAppPaymentTable.InAppPayment?.isPendingBankTransfer(): Boolean {
+    return this != null && (data.paymentMethodType == InAppPaymentData.PaymentMethodType.SEPA_DEBIT || data.paymentMethodType == InAppPaymentData.PaymentMethodType.IDEAL)
+  }
+
   private fun InAppPaymentTable.InAppPayment.toPendingOneTimeDonation(): PendingOneTimeDonation? {
     if (type.recurring || data.amount == null || data.badge == null) {
       return null

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

@@ -1041,11 +1041,11 @@ class ConversationSettingsFragment :
           isEnabled = !state.isDeprecatedOrUnregistered,
           onClick = {
             if (state.recipient.isBlocked) {
-              BlockUnblockDialog.showUnblockFor(requireContext(), viewLifecycleOwner.lifecycle, state.recipient) {
+              BlockUnblockDialog.showUnblockFor(requireContext(), state.recipient) {
                 viewModel.unblock()
               }
             } else {
-              BlockUnblockDialog.showBlockFor(requireContext(), viewLifecycleOwner.lifecycle, state.recipient) {
+              BlockUnblockDialog.showBlockFor(requireContext(), state.recipient) {
                 viewModel.block()
               }
             }
@@ -1061,7 +1061,6 @@ class ConversationSettingsFragment :
             onClick = {
               BlockUnblockDialog.showReportSpamFor(
                 requireContext(),
-                viewLifecycleOwner.lifecycle,
                 state.recipient,
                 {
                   viewModel
@@ -1110,7 +1109,6 @@ class ConversationSettingsFragment :
             onClick = {
               BlockUnblockDialog.showReportSpamFor(
                 requireContext(),
-                viewLifecycleOwner.lifecycle,
                 state.recipient,
                 {
                   viewModel

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

@@ -188,7 +188,7 @@ class InternalConversationSettingsFragment : ComposeFragment(), InternalConversa
               message = OutgoingMessage(threadRecipient = recipient, sentTimeMillis = time, body = "Outgoing: $i"),
               threadId = targetThread
             ).messageId
-            SignalDatabase.messages.markAsSent(id, true)
+            SignalDatabase.messages.markAsSent(id)
           } else {
             SignalDatabase.messages.insertMessageInbox(
               retrieved = IncomingMessage(type = MessageType.NORMAL, from = recipient.id, sentTimeMillis = time, serverTimeMillis = time, receivedTimeMillis = System.currentTimeMillis(), body = "Incoming: $i"),
@@ -218,7 +218,7 @@ class InternalConversationSettingsFragment : ComposeFragment(), InternalConversa
             message = OutgoingMessage(threadRecipient = recipient, sentTimeMillis = time, body = "Outgoing: $i", attachments = listOf(attachment)),
             threadId = targetThread
           ).messageId
-          SignalDatabase.messages.markAsSent(id, true)
+          SignalDatabase.messages.markAsSent(id)
           SignalDatabase.attachments.getAttachmentsForMessage(id).forEach {
             SignalDatabase.attachments.debugMakeValidForArchive(it.attachmentId)
             SignalDatabase.attachments.createRemoteKeyIfNecessary(it.attachmentId)
@@ -252,7 +252,7 @@ class InternalConversationSettingsFragment : ComposeFragment(), InternalConversa
       false,
       null
     ).messageId
-    SignalDatabase.messages.markAsSent(messageId, true)
+    SignalDatabase.messages.markAsSent(messageId)
 
     SignalDatabase.threads.update(splitThreadId, true)
 

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

@@ -7,7 +7,12 @@ package org.thoughtcrime.securesms.components.settings.conversation
 
 import androidx.annotation.WorkerThread
 import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.withStyle
 import org.signal.core.util.Base64
 import org.signal.core.util.Hex
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
@@ -98,18 +103,18 @@ data class InternalConversationSettingsState(
         val capabilities: RecipientRecord.Capabilities? = SignalDatabase.recipients.getCapabilities(recipient.id)
         if (capabilities != null) {
           AnnotatedString("No capabilities right now.")
-          // Left as an example in case we add one in the future
-//          val style: SpanStyle = when (capabilities.storageServiceEncryptionV2) {
-//            Recipient.Capability.SUPPORTED -> SpanStyle(color = Color(0, 150, 0))
-//            Recipient.Capability.NOT_SUPPORTED -> SpanStyle(color = Color.Red)
-//            Recipient.Capability.UNKNOWN -> SpanStyle(fontStyle = FontStyle.Italic)
-//          }
-//
-//          buildAnnotatedString {
-//            withStyle(style = style) {
-//              append("SSREv2")
-//            }
-//          }
+          // Always leave one as an example in case we add one in the future
+          val style: SpanStyle = when (capabilities.usernameSyncMessages) {
+            Recipient.Capability.SUPPORTED -> SpanStyle(color = Color(0, 150, 0))
+            Recipient.Capability.NOT_SUPPORTED -> SpanStyle(color = Color.Red)
+            Recipient.Capability.UNKNOWN -> SpanStyle(fontStyle = FontStyle.Italic)
+          }
+
+          buildAnnotatedString {
+            withStyle(style = style) {
+              append("usernameSyncMessages")
+            }
+          }
         } else {
           AnnotatedString("Recipient not found!")
         }

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt

@@ -6,11 +6,11 @@ import android.text.SpannableStringBuilder
 import android.view.View
 import android.widget.TextView
 import android.widget.Toast
+import org.signal.core.util.ServiceUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.fonts.SignalSymbols
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt

@@ -7,11 +7,13 @@ import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.databinding.ConversationSettingsCallPreferenceItemBinding
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.visible
 
 /**
  * Renders a single call preference row when displaying call info.
@@ -41,6 +43,25 @@ object CallPreference {
       binding.callIcon.setImageResource(getCallIcon(model.call))
       binding.callType.text = getCallType(model.call)
       binding.callTime.text = getCallTime(model.record)
+      presentTimer(model.record)
+    }
+
+    private fun presentTimer(messageRecord: MessageRecord) {
+      if (messageRecord.expiresIn > 0) {
+        binding.callTimer.visible = true
+        binding.callTimer.setPercentComplete(0f)
+
+        if (messageRecord.expireStarted > 0) {
+          binding.callTimer.setExpirationTime(messageRecord.expireStarted, messageRecord.expiresIn)
+          binding.callTimer.startAnimation()
+
+          if (messageRecord.expireStarted + messageRecord.expiresIn <= System.currentTimeMillis()) {
+            AppDependencies.expiringMessageManager.checkSchedule()
+          }
+        }
+      } else {
+        binding.callTimer.visible = false
+      }
     }
 
     @DrawableRes

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/RecipientPreference.kt

@@ -105,7 +105,7 @@ object RecipientPreference {
       } else {
         if (recipient.isSystemContact) {
           SpannableStringBuilder(recipient.getDisplayName(context)).apply {
-            val drawable = context.requireDrawable(R.drawable.symbol_person_circle_24).apply {
+            val drawable = context.requireDrawable(CoreUiR.drawable.symbol_person_circle_24).apply {
               setTint(ContextCompat.getColor(context, CoreUiR.color.signal_colorOnSurface))
             }
             SpanUtil.appendCenteredImageSpan(this, drawable, 16, 16)

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.settings.conversation.sounds.custo
 import android.content.Context
 import android.net.Uri
 import androidx.annotation.WorkerThread
+import org.signal.core.util.concurrent.SerialExecutor
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -10,7 +11,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.concurrent.SerialExecutor
 
 class CustomNotificationsSettingsRepository(context: Context) {
 

app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate.kt

@@ -11,9 +11,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import org.signal.core.util.AccessibilityUtil
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.components.spoiler.SpoilerAnnotation.SpoilerClickableSpan
-import org.thoughtcrime.securesms.util.AccessibilityUtil
 import org.thoughtcrime.securesms.util.getLifecycle
 import org.signal.core.ui.R as CoreUiR
 

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

@@ -18,6 +18,7 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.signal.core.util.ByteSize
+import org.signal.core.util.ThrottledDebouncer
 import org.signal.core.util.bytes
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
@@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.databinding.TransferControlsViewBinding
 import org.thoughtcrime.securesms.events.PartProgressEvent
 import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.util.MediaUtil
-import org.thoughtcrime.securesms.util.ThrottledDebouncer
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.visible
 import java.util.UUID

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.media.AudioManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
 
@@ -116,7 +115,7 @@ public class VoiceNotePlaybackService extends MediaSessionService {
   @Nullable
   @Override
   public MediaSession onGetSession(@NonNull MediaSession.ControllerInfo controllerInfo) {
-    if (Build.VERSION.SDK_INT >= 28 && controllerInfo.getUid() != Process.myUid()) {
+    if (controllerInfo.getUid() != Process.myUid()) {
       Log.w(TAG, "Denying session to external caller: " + controllerInfo.getPackageName());
       return null;
     }

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt

@@ -14,9 +14,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.media3.common.Player
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionCommand
+import org.signal.core.util.ServiceUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCompat
 import java.util.concurrent.TimeUnit
 

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt

@@ -221,7 +221,7 @@ private fun Title(
         style = MaterialTheme.typography.headlineMedium
       )
       Icon(
-        painter = painterResource(id = R.drawable.symbol_person_circle_24),
+        painter = painterResource(id = CoreUiR.drawable.symbol_person_circle_24),
         contentDescription = null,
         modifier = Modifier
           .padding(start = 6.dp)

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallParticipantViewer.kt

@@ -190,7 +190,7 @@ fun SelfPipContent(
     Box(modifier = modifier) {
       VideoRenderer(
         participant = participant,
-        mirror = participant.cameraDirection == CameraState.Direction.FRONT,
+        mirror = !participant.isScreenSharing && participant.cameraDirection == CameraState.Direction.FRONT,
         modifier = Modifier.fillMaxSize()
       )
 

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt

@@ -543,7 +543,7 @@ private fun LargeLocalVideoRenderer(
     participant = localParticipant,
     renderInPip = false,
     raiseHandAllowed = false,
-    mirrorVideo = localParticipant.cameraDirection == CameraState.Direction.FRONT,
+    mirrorVideo = !localParticipant.isScreenSharing && localParticipant.cameraDirection == CameraState.Direction.FRONT,
     showAudioIndicator = false,
     onInfoMoreInfoClick = null,
     modifier = modifier

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/MoveableLocalVideoRenderer.kt

@@ -49,6 +49,7 @@ import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.webrtc.WebRtcLocalRenderState
 import org.thoughtcrime.securesms.events.CallParticipant
+import org.signal.core.ui.R as CoreUiR
 
 /**
  * Small moveable local video renderer that displays the user's video in a draggable and expandable view.
@@ -160,7 +161,7 @@ fun MoveableLocalVideoRenderer(
         ) {
           Icon(
             imageVector = ImageVector.vectorResource(
-              if (isFocused) R.drawable.symbol_minimize_24 else R.drawable.symbol_maximize_24
+              if (isFocused) R.drawable.symbol_minimize_24 else CoreUiR.drawable.symbol_maximize_24
             ),
             tint = MaterialTheme.colorScheme.onSecondaryContainer,
             contentDescription = stringResource(