From 78956ede2fb6114760b4688d0573484bed6c5c82 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 31 Aug 2015 11:41:44 -0700
Subject: [PATCH] Disable keepalive if we disconnect the socket

---
 js/libtextsecure.js                  | 1 +
 libtextsecure/websocket-resources.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 85b88caaf3..b710602b38 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38501,6 +38501,7 @@ axolotlInternal.RecipientRecord = function() {
                 if (this.disconnect) {
                     // automatically disconnect if server doesn't ack
                     this.disconnectTimer = setTimeout(function() {
+                        clearTimeout(this.keepAliveTimer);
                         this.wsr.close(3001, 'No response to keepalive request');
                     }.bind(this), 1000);
                 } else {
diff --git a/libtextsecure/websocket-resources.js b/libtextsecure/websocket-resources.js
index b25354dd9f..8e624a823d 100644
--- a/libtextsecure/websocket-resources.js
+++ b/libtextsecure/websocket-resources.js
@@ -185,6 +185,7 @@
                 if (this.disconnect) {
                     // automatically disconnect if server doesn't ack
                     this.disconnectTimer = setTimeout(function() {
+                        clearTimeout(this.keepAliveTimer);
                         this.wsr.close(3001, 'No response to keepalive request');
                     }.bind(this), 1000);
                 } else {