Allow null expireTimer in sendmessage

9 years ago · 86dbbc9f29
parent 7eea88a545
commit 86dbbc9f29
2 changed files with 2 additions and 2 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -38829,7 +38829,7 @@ function Message(options) {
        throw new Error('Invalid timestamp');
    }

-    if (this.expireTimer !== undefined) {
+    if (this.expireTimer !== undefined && this.expireTimer !== null) {
        if (typeof this.expireTimer !== 'number' || !(this.expireTimer >= 0)) {
            throw new Error('Invalid expireTimer');
        }
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@ -36,7 +36,7 @@ function Message(options) {
        throw new Error('Invalid timestamp');
    }

-    if (this.expireTimer !== undefined) {
+    if (this.expireTimer !== undefined && this.expireTimer !== null) {
        if (typeof this.expireTimer !== 'number' || !(this.expireTimer >= 0)) {
            throw new Error('Invalid expireTimer');
        }