Skip to content

Commit 0adcc88

Browse files
committed
fix expiry updates for groups
1 parent 9595861 commit 0adcc88

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

Signal-Windows/Signal/IncomingMessages.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,14 @@ private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, Signa
163163
composedTimestamp = sent.getTimestamp();
164164
author = null;
165165
prefix = "You have";
166-
conversationId = sent.getDestination().ForceGetValue();
166+
if (message.Group != null)
167+
{
168+
conversationId = Base64.encodeBytes(message.Group.GroupId);
169+
}
170+
else
171+
{
172+
conversationId = sent.getDestination().ForceGetValue();
173+
}
167174
}
168175
else
169176
{
@@ -172,7 +179,14 @@ private void HandleExpirationUpdateMessage(SignalServiceEnvelope envelope, Signa
172179
author = SignalDBContext.GetOrCreateContactLocked(envelope.getSource(), timestamp, this);
173180
prefix = $"{author.ThreadDisplayName} has";
174181
composedTimestamp = envelope.getTimestamp();
175-
conversationId = envelope.getSource();
182+
if (message.Group != null)
183+
{
184+
conversationId = Base64.encodeBytes(message.Group.GroupId);
185+
}
186+
else
187+
{
188+
conversationId = envelope.getSource();
189+
}
176190
}
177191
SignalDBContext.UpdateExpiresInLocked(new SignalConversation() { ThreadId = conversationId }, (uint)message.ExpiresInSeconds);
178192
SignalMessage sm = new SignalMessage()

0 commit comments

Comments
 (0)