Fix build

Surprisingly this code still works

Author: golf1052

Signal-Windows.Lib/IncomingMessages.cs

@@ -327,7 +327,7 @@ private async Task HandleExpirationUpdateMessage(SignalServiceEnvelope envelope,
                 }
             }
             conversation.ExpiresInSeconds = (uint)message.ExpiresInSeconds;
-            SignalDBContext.UpdateExpiresInLocked(conversation, (uint)message.ExpiresInSeconds);
+            SignalDBContext.UpdateExpiresInLocked(conversation);
             string finalMessage;
             if (message.ExpiresInSeconds == 0)
             {

Signal-Windows.Lib/OutgoingMessages.cs

@@ -108,6 +108,9 @@ public async Task Send(SignalServiceMessageSender messageSender, CancellationTok
                 Attachments = outgoingAttachmentsList
             };
 
+            UpdateExpiresAt(OutgoingSignalMessage);
+            DisappearingMessagesManager.QueueForDeletion(OutgoingSignalMessage);
+
             if (!OutgoingSignalMessage.ThreadId.EndsWith("="))
             {
                 if (!token.IsCancellationRequested)
@@ -144,6 +147,25 @@ public async Task Send(SignalServiceMessageSender messageSender, CancellationTok
                 }
             }
         }
+
+        /// <summary>
+        /// Updates a message ExpiresAt to be a timestamp instead of a relative value.
+        /// </summary>
+        /// <param name="message">The message to update</param>
+        private void UpdateExpiresAt(SignalMessage message)
+        {
+            // We update here instead of earlier because we only want to start the timer once the message is actually sent.
+            long messageExpiration;
+            if (message.ExpiresAt == 0)
+            {
+                messageExpiration = 0;
+            }
+            else
+            {
+                messageExpiration = Util.CurrentTimeMillis() + (long)TimeSpan.FromSeconds(message.ExpiresAt).TotalMilliseconds;
+            }
+            message.ExpiresAt = messageExpiration;
+        }
     }
 
     class OutgoingMessages
@@ -173,13 +195,6 @@ public async Task HandleOutgoingMessages()
                     ISendable sendable = null;
                     try
                     {
-                        if (!Token.IsCancellationRequested)
-                        {
-                            await MessageSender.SendMessage(Token, new SignalServiceAddress(outgoingSignalMessage.ThreadId), message);
-                            UpdateExpiresAt(outgoingSignalMessage);
-                            DisappearingMessagesManager.QueueForDeletion(outgoingSignalMessage);
-                            outgoingSignalMessage.Status = SignalMessageStatus.Confirmed;
-                        }
                         sendable = Handle.OutgoingQueue.Take(Token);
                         Logger.LogTrace($"Sending {sendable.GetType().Name}");
                         await sendable.Send(messageSender, Token);
@@ -200,10 +215,11 @@ public async Task HandleOutgoingMessages()
                         }
                         foreach (UntrustedIdentityException e in identityExceptions)
                         {
-                            await SendMessage(recipients, message);
-                            UpdateExpiresAt(outgoingSignalMessage);
-                            DisappearingMessagesManager.QueueForDeletion(outgoingSignalMessage);
-                            outgoingSignalMessage.Status = SignalMessageStatus.Confirmed;
+                            // TODO: Not sure what to do with this.
+                            //await SendMessage(recipients, message);
+                            //UpdateExpiresAt(outgoingSignalMessage);
+                            //DisappearingMessagesManager.QueueForDeletion(outgoingSignalMessage);
+                            //outgoingSignalMessage.Status = SignalMessageStatus.Confirmed;
                             await Handle.HandleOutgoingKeyChangeLocked(e.E164number, Base64.EncodeBytes(e.IdentityKey.serialize()));
                         }
                     }
@@ -241,24 +257,5 @@ public async Task HandleOutgoingMessages()
                 Logger.LogInformation("HandleOutgoingMessages() finished");
             }
         }
-
-        /// <summary>
-        /// Updates a message ExpiresAt to be a timestamp instead of a relative value.
-        /// </summary>
-        /// <param name="message">The message to update</param>
-        private void UpdateExpiresAt(SignalMessage message)
-        {
-            // We update here instead of earlier because we only want to start the timer once the message is actually sent.
-            long messageExpiration;
-            if (message.ExpiresAt == 0)
-            {
-                messageExpiration = 0;
-            }
-            else
-            {
-                messageExpiration = Util.CurrentTimeMillis() + (long)TimeSpan.FromSeconds(message.ExpiresAt).TotalMilliseconds;
-            }
-            message.ExpiresAt = messageExpiration;
-        }
     }
 }

Signal-Windows.Lib/SignalLibHandle.cs

@@ -417,13 +417,13 @@ public void RequestSync()
         /// <param name="message"></param>
         public async Task SetMessageRead(SignalMessage message)
         {
-            UpdateMessageExpiration(message, conversation.ExpiresInSeconds);
             Logger.LogTrace("SetMessageRead() locking");
             await SemaphoreSlim.WaitAsync(CancelSource.Token);
             try
             {
                 Logger.LogTrace("SetMessageRead() locked");
                 var updatedConversation = SignalDBContext.UpdateMessageRead(message.ComposedTimestamp);
+                UpdateMessageExpiration(message, updatedConversation.ExpiresInSeconds);
                 OutgoingQueue.Add(new SignalServiceSyncMessageSendable(SignalServiceSyncMessage.ForRead(new List<ReadMessage>() {
                         new ReadMessage(message.Author.ThreadId, message.ComposedTimestamp)
                 })));