From c1caff80051f7cdeeb54e6900c28f38348576add Mon Sep 17 00:00:00 2001
From: jeffrey-signal <jeffrey@signal.org>
Date: Mon, 8 Dec 2025 17:20:22 -0600
Subject: [PATCH] Fix error when sending stories to unverified recipients.

---
 .../securesms/mediasend/v2/UntrustedRecords.kt           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
index f985c4283c..f6260e244f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
@@ -10,7 +10,8 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
-import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.seconds
 
 object UntrustedRecords {
 
@@ -43,12 +44,14 @@ object UntrustedRecords {
       .flatten()
 
     val calculatedUntrustedWindow = System.currentTimeMillis() - changedSince
-    return AppDependencies
+    val identityRecords = AppDependencies
       .protocolStore
       .aci()
       .identities()
       .getIdentityRecords(recipients)
-      .getUntrustedRecords(calculatedUntrustedWindow.coerceIn(TimeUnit.SECONDS.toMillis(5)..TimeUnit.HOURS.toMillis(1)))
+
+    val untrustedRecords = identityRecords.getUntrustedRecords(calculatedUntrustedWindow.coerceIn(5.seconds.inWholeMilliseconds..1.hours.inWholeMilliseconds))
+    return (untrustedRecords + identityRecords.unverifiedRecords).distinctBy { it.recipientId }
   }
 
   class UntrustedRecordsException(val untrustedRecords: List<IdentityRecord>, val destinations: Set<ContactSearchKey.RecipientSearchKey>) : Throwable()