Fix handling sent messages sans expirationStartTimestamp

9 years ago · 1da44c847b
parent 2bbee2d72d
commit 1da44c847b
2 changed files with 8 additions and 4 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -38249,9 +38249,11 @@ MessageReceiver.prototype.extend({
                ev.data = {
                    destination              : destination,
                    timestamp                : timestamp.toNumber(),
-                    message                  : message,
-                    expirationStartTimestamp : expirationStartTimestamp.toNumber()
+                    message                  : message
                };
+                if (expirationStartTimestamp) {
+                  ev.data.expirationStartTimestamp = expirationStartTimestamp.toNumber();
+                }
                this.dispatchEvent(ev);
            }.bind(this));
        }.bind(this));
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@ -178,9 +178,11 @@ MessageReceiver.prototype.extend({
                ev.data = {
                    destination              : destination,
                    timestamp                : timestamp.toNumber(),
-                    message                  : message,
-                    expirationStartTimestamp : expirationStartTimestamp.toNumber()
+                    message                  : message
                };
+                if (expirationStartTimestamp) {
+                  ev.data.expirationStartTimestamp = expirationStartTimestamp.toNumber();
+                }
                this.dispatchEvent(ev);
            }.bind(this));
        }.bind(this));