Fix up websocket options handling

10 years ago · 98edd3939b
parent 4c9d69094d
commit 98edd3939b
2 changed files with 8 additions and 2 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -38409,7 +38409,10 @@ axolotlInternal.RecipientRecord = function() {
 TextSecureWebSocket = function (url, opts) {
    'use strict';
    opts = opts || {};
-    var reconnectTimeout = opts.reconnectTimeout || 1000;
+    var reconnectTimeout = 1000;
+    if (opts && opts.reconnectTimeout !== undefined) {
+        reconnectTimeout = opts.reconnectTimeout;
+    }
    var reconnectSemaphore = 0;
    var socket;
    var calledClose = false;
--- a/libtextsecure/websocket.js
+++ b/libtextsecure/websocket.js
@ -25,7 +25,10 @@
 TextSecureWebSocket = function (url, opts) {
    'use strict';
    opts = opts || {};
-    var reconnectTimeout = opts.reconnectTimeout || 1000;
+    var reconnectTimeout = 1000;
+    if (opts && opts.reconnectTimeout !== undefined) {
+        reconnectTimeout = opts.reconnectTimeout;
+    }
    var reconnectSemaphore = 0;
    var socket;
    var calledClose = false;