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

Ignore expireTimer on session reset messages

Browse source
This commit is contained in:
lilia 2016-10-05 22:32:40 +09:00
parent 4ee2652367
commit d3a2f5c838
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/messages.js
View file

@ -394,6 +394,8 @@
} else if (dataMessage.expireTimer) { } else if (dataMessage.expireTimer) {
message.set({expireTimer: dataMessage.expireTimer}); message.set({expireTimer: dataMessage.expireTimer});
} }
if (!message.isEndSession()) {
if (dataMessage.expireTimer) { if (dataMessage.expireTimer) {
if (dataMessage.expireTimer !== conversation.get('expireTimer')) { if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
conversation.addExpirationTimerUpdate( conversation.addExpirationTimerUpdate(
@ -404,6 +406,7 @@
conversation.addExpirationTimerUpdate(0, source, conversation.addExpirationTimerUpdate(0, source,
message.get('received_at')); message.get('received_at'));
} }
}
var conversation_timestamp = conversation.get('timestamp'); var conversation_timestamp = conversation.get('timestamp');
if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) { if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {