Skip to content

Commit 9d89d9b

Browse files
committed
Propagate expiry updates to frontend
1 parent 77411b6 commit 9d89d9b

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Signal-Windows.Lib/IncomingMessages.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ private void HandleGroupUpdateMessage(SignalServiceEnvelope envelope, SignalServ
443443
{
444444
displayname = group.Name;
445445
}
446-
var dbgroup = SignalDBContext.InsertOrUpdateGroupLocked(groupid, displayname, avatarfile, true, timestamp);
446+
var dbgroup = SignalDBContext.InsertOrUpdateGroupLocked(groupid, displayname, avatarfile, true, 0, timestamp);
447447
if (group.Members != null)
448448
{
449449
foreach (var member in group.Members)

Signal-Windows.Lib/Storage/DB.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ public static SignalGroup GetOrCreateGroupLocked(string groupId, long timestamp,
12221222
return dbgroup;
12231223
}
12241224

1225-
public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displayname, string avatarfile, bool canReceive, long timestamp)
1225+
public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displayname, string avatarfile, bool canReceive, uint expiresInSeconds, long timestamp)
12261226
{
12271227
SignalGroup dbgroup;
12281228
lock (DBLock)
@@ -1244,6 +1244,7 @@ public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displ
12441244
AvatarFile = avatarfile,
12451245
UnreadCount = 0,
12461246
CanReceive = canReceive,
1247+
ExpiresInSeconds = expiresInSeconds,
12471248
GroupMemberships = new List<GroupMembership>()
12481249
};
12491250
ctx.Add(dbgroup);
@@ -1253,6 +1254,7 @@ public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displ
12531254
dbgroup.ThreadDisplayName = displayname;
12541255
dbgroup.LastActiveTimestamp = timestamp;
12551256
dbgroup.AvatarFile = avatarfile;
1257+
dbgroup.ExpiresInSeconds = expiresInSeconds;
12561258
dbgroup.CanReceive = true;
12571259
}
12581260
ctx.SaveChanges();

Signal-Windows/ViewModels/MainPageViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ public void AddOrUpdateConversation(SignalConversation conversation, SignalMessa
184184
uiConversation = ConversationsDictionary[conversation.ThreadId];
185185
uiConversation.LastActiveTimestamp = conversation.LastActiveTimestamp;
186186
uiConversation.CanReceive = conversation.CanReceive;
187+
uiConversation.ExpiresInSeconds = conversation.ExpiresInSeconds;
187188
uiConversation.LastMessage = conversation.LastMessage;
188189
uiConversation.LastSeenMessage = conversation.LastSeenMessage;
189190
uiConversation.LastSeenMessageIndex = conversation.LastSeenMessageIndex;

0 commit comments

Comments
 (0)