From 0e536d59577274e8659b43256419aef0a3465e72 Mon Sep 17 00:00:00 2001
From: Schmiddiii <github@schmiddi.anonaddy.com>
Date: Thu, 4 Jan 2024 12:13:59 +0100
Subject: [PATCH] Potential fix for expire timer turning off (#227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I had the assumption that once an expire timer was set, the field would
always be populated. I think now that this assumption is wrong.
Therefore, one should only update the expire timer if the field is
really set.

Co-authored-by: Gabriel Féron <g@leirbag.net>
---
 presage/src/manager/registered.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/presage/src/manager/registered.rs b/presage/src/manager/registered.rs
index b67a0ce3f..4949abbf7 100644
--- a/presage/src/manager/registered.rs
+++ b/presage/src/manager/registered.rs
@@ -1139,7 +1139,9 @@ async fn save_message<S: Store>(
                 store.upsert_profile_key(&sender_uuid, profile_key)?;
             }
 
-            store.update_expire_timer(&thread, data_message.expire_timer.unwrap_or_default())?;
+            if let Some(expire_timer) = data_message.expire_timer {
+                store.update_expire_timer(&thread, expire_timer)?;
+            }
 
             match data_message {
                 DataMessage {