Merge timer update functions

2017-01-03 13:52:29 +01:00 · 2017-01-03 13:52:29 +01:00 · 05ed7c3822
commit 05ed7c3822
parent f2bdafc7e9
3 changed files with 19 additions and 19 deletions
--- a/js/models/messages.js
+++ b/js/models/messages.js
@ -398,12 +398,12 @@
                        if (!message.isEndSession()) {
                            if (dataMessage.expireTimer) {
                                if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
-                                  conversation.addExpirationTimerUpdate(
+                                  conversation.updateExpirationTimer(
                                      dataMessage.expireTimer, source,
                                      message.get('received_at'));
                                }
                            } else if (conversation.get('expireTimer')) {
-                                conversation.addExpirationTimerUpdate(0, source,
+                                conversation.updateExpirationTimer(0, source,
                                    message.get('received_at'));
                            }
                        }