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

Handle timer updates along with group updates

Browse source
This commit is contained in:
Scott Nonnenberg 2018-06-25 15:58:55 -07:00
parent 67464774c3
commit 9d9a797bda
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/models/messages.js
View file

@ -641,7 +641,7 @@
});
}
if (!message.isEndSession() && !message.isGroupUpdate()) {
if (!message.isEndSession()) {
if (dataMessage.expireTimer) {
if (
dataMessage.expireTimer !== conversation.get('expireTimer')
@ -649,10 +649,17 @@
conversation.updateExpirationTimer(
dataMessage.expireTimer,
source,
message.get('received_at')
message.get('received_at'),
{
fromGroupUpdate: message.isGroupUpdate(),
}
);
}
} else if (conversation.get('expireTimer')) {
} else if (
conversation.get('expireTimer') &&
// We only turn off timers if it's not a group update
!message.isGroupUpdate()
) {
conversation.updateExpirationTimer(
null,
source,