From d3a2f5c838c15fd09f38e59fa7ef22bc48092fee Mon Sep 17 00:00:00 2001 From: lilia Date: Wed, 5 Oct 2016 22:32:40 +0900 Subject: [PATCH] Ignore expireTimer on session reset messages --- js/models/messages.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/js/models/messages.js b/js/models/messages.js index cb11c3bdc..6abdbf5ee 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -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');