From 8fc9893ecd4db190dc7629e5dda250eb5148b71b Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 21 Feb 2024 13:04:42 -0500 Subject: [PATCH] Improve logging around retries archiving sessions. --- .../messages/MessageContentProcessor.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt index 39a5fbf485..3a946beda8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt @@ -657,12 +657,16 @@ open class MessageContentProcessor(private val context: Context) { return } - if (decryptionErrorMessage.ratchetKey.isPresent && - ratchetKeyMatches(requester, metadata.sourceDeviceId, decryptionErrorMessage.ratchetKey.get()) - ) { - warn(envelope.timestamp!!, "[RetryReceipt-I] Ratchet key matches. Archiving the session.") - ApplicationDependencies.getProtocolStore().aci().sessions().archiveSession(requester.requireServiceId(), metadata.sourceDeviceId) - archivedSession = true + if (decryptionErrorMessage.ratchetKey.isPresent) { + if (ratchetKeyMatches(requester, metadata.sourceDeviceId, decryptionErrorMessage.ratchetKey.get())) { + warn(envelope.timestamp!!, "[RetryReceipt-I] Ratchet key matches. Archiving the session.") + ApplicationDependencies.getProtocolStore().aci().sessions().archiveSession(requester.requireServiceId(), metadata.sourceDeviceId) + archivedSession = true + } else { + log(envelope.timestamp!!, "[RetryReceipt-I] Ratchet key does not match. Leaving the session as-is.") + } + } else { + warn(envelope.timestamp!!, "[RetryReceipt-I] Missing ratchet key! Can't archive session.") } if (messageLogEntry != null) {