From 8f99b5aa11097f355dfb8af16bb1bdb452d2b5c8 Mon Sep 17 00:00:00 2001 From: charles Date: Wed, 21 Dec 2022 14:40:48 +1100 Subject: [PATCH] Start disappearing after sent for closed groups --- .../session/libsession/messaging/jobs/BatchMessageReceiveJob.kt | 2 ++ .../messaging/sending_receiving/ReceivedMessageHandler.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt index 07c104cfda..84af6ebdec 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt @@ -18,6 +18,7 @@ import org.session.libsession.messaging.sending_receiving.MessageReceiver import org.session.libsession.messaging.sending_receiving.handle import org.session.libsession.messaging.sending_receiving.handleOpenGroupReactions import org.session.libsession.messaging.sending_receiving.handleVisibleMessage +import org.session.libsession.messaging.sending_receiving.updateExpirationConfigurationIfNeeded import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.SessionId import org.session.libsession.messaging.utilities.SodiumUtilities @@ -112,6 +113,7 @@ class BatchMessageReceiveJob( messages.forEach { (parameters, message, proto) -> try { if (message is VisibleMessage) { + MessageReceiver.updateExpirationConfigurationIfNeeded(message, proto, openGroupID) val messageId = MessageReceiver.handleVisibleMessage(message, proto, openGroupID, runIncrement = false, runThreadUpdate = false, diff --git 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 index 6c47f0f9df..e184cbc453 100644 --- 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 @@ -86,7 +86,7 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content, JobQueue.shared.add(DisappearingMessagesJob()) } -fun updateExpirationConfigurationIfNeeded(message: Message, proto: SignalServiceProtos.Content, openGroupID: String?) { +fun MessageReceiver.updateExpirationConfigurationIfNeeded(message: Message, proto: SignalServiceProtos.Content, openGroupID: String?) { val storage = MessagingModuleConfiguration.shared.storage val disappearingState = if (proto.hasExpirationTimer()) DisappearingState.UPDATED else DisappearingState.LEGACY storage.updateDisappearingState(message.sender!!, disappearingState)