From 400313f749e65692fccc4f95fcd20d2820534c5d Mon Sep 17 00:00:00 2001
From: Thomas Guillet <guillet.thomas@gmail.com>
Date: Wed, 4 Jan 2017 11:43:05 +0100
Subject: [PATCH] Prevent expiration timer update on group update

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
---
 js/models/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index da64f67d68..bd9660c756 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -405,7 +405,7 @@
                             message.set({expireTimer: dataMessage.expireTimer});
                         }
 
-                        if (!message.isEndSession()) {
+                        if (!message.isEndSession() && !message.isGroupUpdate()) {
                             if (dataMessage.expireTimer) {
                                 if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
                                   conversation.updateExpirationTimer(