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

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

19
js/models/messages.js
View File

@@ -394,15 +394,18 @@
} else if (dataMessage.expireTimer) {
message.set({expireTimer: dataMessage.expireTimer});
}
if (dataMessage.expireTimer) {
if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
conversation.addExpirationTimerUpdate(
dataMessage.expireTimer, source,
message.get('received_at'));
if (!message.isEndSession()) {
if (dataMessage.expireTimer) {
if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
conversation.addExpirationTimerUpdate(
dataMessage.expireTimer, source,
message.get('received_at'));
}
} else if (conversation.get('expireTimer')) {
conversation.addExpirationTimerUpdate(0, source,
message.get('received_at'));
}
} else if (conversation.get('expireTimer')) {
conversation.addExpirationTimerUpdate(0, source,
message.get('received_at'));
}
var conversation_timestamp = conversation.get('timestamp');