From 2b563212b4ecd3a9ed6082e92e05902e4edd8e94 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 29 Jul 2015 10:51:33 -0700
Subject: [PATCH] Change default for keepalive autodisconnect config

By default, automatically disconnect if no response. This is preferable
because we can sometimes lose connectivity without receiving a close
event from the socket, but it's also possible that the endpoint may not
support responses.

// FREEBIE
---
 js/libtextsecure.js                            |  2 +-
 libtextsecure/test/websocket-resources_test.js | 12 +++++-------
 libtextsecure/websocket-resources.js           |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index e8ee6e0b7..d3d2360a5 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38636,7 +38636,7 @@ TextSecureWebSocket = function (url, opts) {
             }
             this.disconnect = opts.disconnect;
             if (this.disconnect === undefined) {
-                this.disconnect = false;
+                this.disconnect = true;
             }
             this.wsr = websocketResource;
             this.reset();
diff --git a/libtextsecure/test/websocket-resources_test.js b/libtextsecure/test/websocket-resources_test.js
index 46b705504..3c57b3d26 100644
--- a/libtextsecure/test/websocket-resources_test.js
+++ b/libtextsecure/test/websocket-resources_test.js
@@ -128,8 +128,8 @@
                         done();
                     });
                 });
-                var resource = new WebSocketResource(new WebSocket('ws://localhost:8081'), {
-                    keepalive: { path: '/v1/keepalive', disconnect: true }
+                new WebSocketResource(new WebSocket('ws://localhost:8081'), {
+                    keepalive: { path: '/v1/keepalive' }
                 });
             });
 
@@ -145,8 +145,8 @@
                         done();
                     });
                 });
-                var resource = new WebSocketResource(new WebSocket('ws://localhost:8081'), {
-                    keepalive: { disconnect: true }
+                new WebSocketResource(new WebSocket('ws://localhost:8081'), {
+                    keepalive: true
                 });
 
             });
@@ -158,9 +158,7 @@
                 mockServer.on('connection', function(server) {
                     server.on('close', done);
                 });
-                var resource = new WebSocketResource(socket, {
-                    keepalive: { disconnect: true }
-                });
+                new WebSocketResource(socket, { keepalive: true });
             });
 
             it('allows resetting the keepalive timer', function(done) {
diff --git a/libtextsecure/websocket-resources.js b/libtextsecure/websocket-resources.js
index 112cd7c22..47c31f354 100644
--- a/libtextsecure/websocket-resources.js
+++ b/libtextsecure/websocket-resources.js
@@ -165,7 +165,7 @@
             }
             this.disconnect = opts.disconnect;
             if (this.disconnect === undefined) {
-                this.disconnect = false;
+                this.disconnect = true;
             }
             this.wsr = websocketResource;
             this.reset();