Update ExpiresAt only when message is read

Author: golf1052

Signal-Windows.Lib/IncomingMessages.cs

@@ -530,15 +530,6 @@ private async Task HandleGroupUpdateMessage(SignalServiceEnvelope envelope, Sign
                     composedTimestamp = envelope.GetTimestamp();
                 }
 
-                long messageExpiration;
-                if (dataMessage.ExpiresInSeconds == 0)
-                {
-                    messageExpiration = 0;
-                }
-                else
-                {
-                    messageExpiration = timestamp + (long)TimeSpan.FromSeconds(dataMessage.ExpiresInSeconds).TotalMilliseconds;
-                }
                 SignalMessage sm = new SignalMessage()
                 {
                     Direction = type,
@@ -550,8 +541,7 @@ private async Task HandleGroupUpdateMessage(SignalServiceEnvelope envelope, Sign
                     DeviceId = (uint)envelope.GetSourceDevice(),
                     Receipts = 0,
                     ComposedTimestamp = composedTimestamp,
-                    ReceivedTimestamp = timestamp,
-                    ExpiresAt = messageExpiration
+                    ReceivedTimestamp = timestamp
                 };
                 SignalDBContext.SaveMessageLocked(sm);
                 dbgroup.MessagesCount += 1;
@@ -637,15 +627,6 @@ private async Task HandleSignalMessage(SignalServiceEnvelope envelope, SignalSer
                 return;
             }
 
-            long messageExpiration;
-            if (dataMessage.ExpiresInSeconds == 0)
-            {
-                messageExpiration = 0;
-            }
-            else
-            {
-                messageExpiration = timestamp + (long)TimeSpan.FromSeconds(dataMessage.ExpiresInSeconds).TotalMilliseconds;
-            }
             List<SignalAttachment> attachments = new List<SignalAttachment>();
             SignalMessage message = new SignalMessage()
             {
@@ -658,7 +639,6 @@ private async Task HandleSignalMessage(SignalServiceEnvelope envelope, SignalSer
                 Receipts = 0,
                 ComposedTimestamp = composedTimestamp,
                 ReceivedTimestamp = timestamp,
-                ExpiresAt = messageExpiration,
                 AttachmentsCount = (uint)attachments.Count,
                 Attachments = attachments
             };
@@ -686,7 +666,6 @@ private async Task HandleSignalMessage(SignalServiceEnvelope envelope, SignalSer
                 // Make sure to update attachments count
                 message.AttachmentsCount = (uint)attachments.Count;
             }
-            DisappearingMessagesManager.QueueForDeletion(message);
             await SignalLibHandle.Instance.SaveAndDispatchSignalMessage(message, conversation);
         }
     }

Signal-Windows.Lib/SignalLibHandle.cs

@@ -378,6 +378,7 @@ public void RequestSync()
         /// <param name="message"></param>
         public async Task SetMessageRead(long index, SignalMessage message, SignalConversation conversation)
         {
+            UpdateMessageExpiration(message, conversation.ExpiresInSeconds);
             Logger.LogTrace("SetMessageRead() locking");
             await SemaphoreSlim.WaitAsync(CancelSource.Token);
             try
@@ -642,6 +643,7 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                     AppendResult result = await b;
                     if (result != null)
                     {
+                        UpdateMessageExpiration(message, conversation.ExpiresInSeconds);
                         SignalDBContext.UpdateMessageRead(result.Index, conversation);
                         await DispatchMessageRead(result.Index + 1, conversation);
                         wasInstantlyRead = true;
@@ -713,6 +715,29 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             }
         }
 
+        internal void UpdateMessageExpiration(SignalMessage message, uint conversationExpireTimeSeconds)
+        {
+            if (message.Type == Signal_Windows.Models.SignalMessageType.Normal && message.ExpiresAt == 0)
+            {
+                long messageExpiration;
+                if (conversationExpireTimeSeconds == 0)
+                {
+                    messageExpiration = 0;
+                }
+                else
+                {
+                    messageExpiration = Util.CurrentTimeMillis() + (long)TimeSpan.FromSeconds(conversationExpireTimeSeconds).TotalMilliseconds;
+                }
+
+                if (messageExpiration > 0)
+                {
+                    message.ExpiresAt = messageExpiration;
+                    SignalDBContext.UpdateMessageExpiresAt(message);
+                    DisappearingMessagesManager.QueueForDeletion(message);
+                }
+            }
+        }
+
         internal void DispatchPipeEmptyMessage()
         {
             SignalMessageEvent?.Invoke(this, new SignalMessageEventArgs(null, Events.SignalMessageType.PipeEmptyMessage));

Signal-Windows.Lib/Storage/DB.cs

@@ -919,6 +919,19 @@ public static SignalMessage IncreaseReceiptCountLocked(SignalServiceEnvelope env
             return set_mark? m : null;
         }
 
+        public static void UpdateMessageExpiresAt(SignalMessage message)
+        {
+            lock (DBLock)
+            {
+                using (var ctx = new SignalDBContext())
+                {
+                    var m = ctx.Messages.Single(t => t.Id == message.Id);
+                    m.ExpiresAt = message.ExpiresAt;
+                    ctx.SaveChanges();
+                }
+            }
+        }
+
         /// <summary>
         /// Gets messages older than the given timestamp.
         /// </summary>