Pick correct config on receive message

1 year ago · 29099901d1
parent b0447cf342
commit 29099901d1
1 changed files with 3 additions and 3 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@ -310,9 +310,9 @@ fun MessageReceiver.updateExpiryIfNeeded(
        storage.updateDisappearingState(threadID, disappearingState)
    }

-    if (localConfig != null || localConfig!!) {
-        storage.setExpirationConfiguration(remoteConfig)
-    }
+    remoteConfig.takeIf { localConfig == null || it.updatedTimestampMs > localConfig.updatedTimestampMs }
+        ?.let(storage::setExpirationConfiguration)
+

    if (message is ExpirationTimerUpdate) {
        SSKEnvironment.shared.messageExpirationManager.setExpirationTimer(message, type?.expiryMode(durationSeconds.toLong()))