Insert timer update messages when inferring timer changes

9 years ago · 7a26cf79ee
parent ad2174e279
commit 7a26cf79ee
1 changed files with 7 additions and 2 deletions
--- 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');