Skip to content

Commit 64d6ddf

Browse files
committed
Don't whipe the disappearing messages timer on group updates
fixes #172
1 parent 8989053 commit 64d6ddf

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Signal-Windows.Lib/IncomingMessages.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ private async Task HandleGroupUpdateMessage(SignalServiceEnvelope envelope, Sign
485485
{
486486
displayname = group.Name;
487487
}
488-
var dbgroup = SignalDBContext.InsertOrUpdateGroupLocked(groupid, displayname, avatarfile, true, 0, timestamp);
488+
var dbgroup = SignalDBContext.InsertOrUpdateGroupLocked(groupid, displayname, avatarfile, true, timestamp);
489489
if (group.Members != null)
490490
{
491491
foreach (var member in group.Members)

Signal-Windows.Lib/Storage/DB.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ public static async Task<SignalGroup> GetOrCreateGroupLocked(string groupId, lon
11771177
return dbgroup;
11781178
}
11791179

1180-
public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displayname, string avatarfile, bool canReceive, uint expiresInSeconds, long timestamp)
1180+
public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displayname, string avatarfile, bool canReceive, long timestamp)
11811181
{
11821182
SignalGroup dbgroup;
11831183
lock (DBLock)
@@ -1199,7 +1199,7 @@ public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displ
11991199
AvatarFile = avatarfile,
12001200
UnreadCount = 0,
12011201
CanReceive = canReceive,
1202-
ExpiresInSeconds = expiresInSeconds,
1202+
ExpiresInSeconds = 0,
12031203
GroupMemberships = new List<GroupMembership>()
12041204
};
12051205
ctx.Add(dbgroup);
@@ -1209,7 +1209,6 @@ public static SignalGroup InsertOrUpdateGroupLocked(string groupId, string displ
12091209
dbgroup.ThreadDisplayName = displayname;
12101210
dbgroup.LastActiveTimestamp = timestamp;
12111211
dbgroup.AvatarFile = avatarfile;
1212-
dbgroup.ExpiresInSeconds = expiresInSeconds;
12131212
dbgroup.CanReceive = true;
12141213
}
12151214
ctx.SaveChanges();

0 commit comments

Comments
 (0)