From 7a26cf79ee5fc01b82728f69faa6f415b9d8301a Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 28 Sep 2016 18:33:17 -0700
Subject: [PATCH] Insert timer update messages when inferring timer changes

---
 js/models/messages.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 95236ed90..d6bf4d174 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -366,8 +366,13 @@
                             conversation.set({expireTimer: dataMessage.expireTimer});
                         } else if (dataMessage.expireTimer) {
                             message.set({expireTimer: dataMessage.expireTimer});
-                            // todo: insert an update if needed
-                            conversation.set({expireTimer: dataMessage.expireTimer});
+                        }
+                        if (dataMessage.expireTimer) {
+                            if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
+                              conversation.addExpirationTimerUpdate(dataMessage.expireTimer, source);
+                            }
+                        } else if (conversation.get('expireTimer')) {
+                            conversation.addExpirationTimerUpdate(0, source);
                         }
 
                         var conversation_timestamp = conversation.get('timestamp');