colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent expiration timer update on group update

Browse Source 
It occurs when a message with a different expiration time is received.

The issue report highlights the scenario of a member leaving a group
(group update [quit] sent with expiration time = 0).

Fix https://github.com/WhisperSystems/Signal-Android/issues/5996
Fix https://github.com/WhisperSystems/Signal-iOS/issues/1566
This commit is contained in:
Thomas Guillet
2017-01-04 11:43:05 +01:00
committed by lilia
parent 9ef61d43f4
commit 400313f749
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/models/messages.js
View File

@@ -405,7 +405,7 @@
message.set({expireTimer: dataMessage.expireTimer}); message.set({expireTimer: dataMessage.expireTimer});
} }
if (!message.isEndSession()) { if (!message.isEndSession() && !message.isGroupUpdate()) {
if (dataMessage.expireTimer) { if (dataMessage.expireTimer) {
if (dataMessage.expireTimer !== conversation.get('expireTimer')) { if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
conversation.updateExpirationTimer( conversation.updateExpirationTimer(