mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 13:08:46 +00:00
Fix error when sending stories to unverified recipients.
This commit is contained in:
committed by
Michelle Tang
parent
04ccefbcf8
commit
c1caff8005
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user