From 43745ce995f8e09724d091df1a8c37e13e529d75 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 23 Jan 2024 12:09:36 +1000
Subject: [PATCH] Retrieve expiry config from UpdateMessage for GroupsV1

---
 .../messaging/sending_receiving/ReceivedMessageHandler.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 2ca3be8b51..c288278b99 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
@@ -158,7 +158,10 @@ fun MessageReceiver.cancelTypingIndicatorsIfNeeded(senderPublicKey: String) {
 private fun MessageReceiver.handleExpirationTimerUpdate(message: ExpirationTimerUpdate) {
     SSKEnvironment.shared.messageExpirationManager.insertExpirationTimerMessage(message)
 
-    if (isNewConfigEnabled) return
+    // TODO (Groups V2 - FIXME)
+    val isGroupV1 = message.groupPublicKey != null
+
+    if (isNewConfigEnabled && !isGroupV1) return
 
     val module = MessagingModuleConfiguration.shared
     try {