Skip to content

Commit dfdba7f

Browse files
committed
Actually update DB with new conversation expiration after we update it
1 parent 244952c commit dfdba7f

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Signal-Windows.Lib/IncomingMessages.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,16 @@ public async Task OnMessage(SignalServiceMessagePipeMessage message)
104104
private async Task HandleMessage(SignalServiceEnvelope envelope)
105105
{
106106
var cipher = new SignalServiceCipher(new SignalServiceAddress(SignalLibHandle.Instance.Store.Username), new Store(), LibUtils.GetCertificateValidator());
107+
// TODO: Starting to get messages of an unknown type which causes Decrypt to return null, so handle the null case for now.
107108
var content = cipher.Decrypt(envelope);
108109
long timestamp = Util.CurrentTimeMillis();
109110

111+
if (content == null)
112+
{
113+
//TODO callmessages
114+
Logger.LogWarning("HandleMessage() received unrecognized message");
115+
return;
116+
}
110117
if (content.Message != null)
111118
{
112119
SignalServiceDataMessage message = content.Message;

Signal-Windows/ViewModels/ConversationSettingsPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ internal async Task SetDisappearingMessagesTime(TimeSpan timeSpan)
128128
Contact.ExpiresInSeconds = (uint)timeSpan.TotalSeconds;
129129
await Task.Run(() =>
130130
{
131-
App.Handle.SaveAndDispatchSignalConversation(Contact, null);
131+
SignalDBContext.UpdateExpiresInLocked(Contact);
132132
});
133133
}
134134

0 commit comments

Comments
 (0)