From 9de23a967b533a28b3efdcf7c40f25c0a4da569e Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 31 Aug 2015 12:18:01 -0700
Subject: [PATCH] Fix dropping the first websocket message

---
 js/libtextsecure.js              | 9 +++++----
 libtextsecure/account_manager.js | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index a7e66dadd..6aaeb6d8c 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39147,15 +39147,16 @@ var TextSecureServer = (function() {
             }.bind(this));
         },
         registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
-            var socket = this.server.getProvisioningSocket();
-            socket.onclose = function(e) {
-                console.log('websocket closed', e.code);
-            };
             var createAccount = this.createAccount.bind(this);
             var generateKeys = this.generateKeys.bind(this, 100, progressCallback);
             var registerKeys = this.server.registerKeys.bind(this.server);
+            var getSocket = this.server.getProvisioningSocket.bind(this.server);
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
+                    var socket = getSocket();
+                    socket.onclose = function(e) {
+                        console.log('websocket closed', e.code);
+                    };
                     var wsr = new WebSocketResource(socket, {
                         keepalive: { path: '/v1/keepalive/provisioning' },
                         handleRequest: function(request) {
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 29f274bba..ee06d35bd 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -31,15 +31,16 @@
             }.bind(this));
         },
         registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
-            var socket = this.server.getProvisioningSocket();
-            socket.onclose = function(e) {
-                console.log('websocket closed', e.code);
-            };
             var createAccount = this.createAccount.bind(this);
             var generateKeys = this.generateKeys.bind(this, 100, progressCallback);
             var registerKeys = this.server.registerKeys.bind(this.server);
+            var getSocket = this.server.getProvisioningSocket.bind(this.server);
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
+                    var socket = getSocket();
+                    socket.onclose = function(e) {
+                        console.log('websocket closed', e.code);
+                    };
                     var wsr = new WebSocketResource(socket, {
                         keepalive: { path: '/v1/keepalive/provisioning' },
                         handleRequest: function(request) {