From bc4be99070a1cac1a010d125775195a71f59568c Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 9 Dec 2020 13:06:15 +1100
Subject: [PATCH] Fix Android compatibility issue

---
 .../Messages/Control Messages/ClosedGroupUpdate.swift        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/SessionMessagingKit/Messages/Control Messages/ClosedGroupUpdate.swift b/SessionMessagingKit/Messages/Control Messages/ClosedGroupUpdate.swift
index 2e2bc18f9..1a0931e51 100644
--- a/SessionMessagingKit/Messages/Control Messages/ClosedGroupUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ClosedGroupUpdate.swift	
@@ -158,6 +158,11 @@ public final class ClosedGroupUpdate : ControlMessage {
             dataMessageProto.setClosedGroupUpdate(try closedGroupUpdate.build())
             // Group context
             try setGroupContextIfNeeded(on: dataMessageProto, using: transaction)
+            // Expiration timer
+            // TODO: We * want * expiration timer updates to be explicit. But currently Android will disable the expiration timer for a conversation
+            // if it receives a message without the current expiration timer value attached to it...
+            let expiration = OWSDisappearingMessagesConfiguration.fetch(uniqueId: threadID!, transaction: transaction)?.durationSeconds ?? 0
+            dataMessageProto.setExpireTimer(expiration)
             contentProto.setDataMessage(try dataMessageProto.build())
             return try contentProto.build()
         } catch {