mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Don't expire incoming expiration timer updates

Browse source
This commit is contained in:
Evan Hahn 2021-07-01 18:48:40 -05:00 • committed by GitHub
parent 75cb7b6b13
commit 7dac480df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/models/messages.ts
View file

@ -2855,7 +2855,10 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
attributes.active_at = now;
conversation.set(attributes);
if (dataMessage.expireTimer) {
if (
dataMessage.expireTimer &&
!isExpirationTimerUpdate(dataMessage)
) {
message.set({ expireTimer: dataMessage.expireTimer });
}