thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't reconnect if close was called

Browse source 
Fixes a bug during re-registration where we continue to re-open
the socket using old credentials.

// FREEBIE
This commit is contained in:
lilia 2015-11-05 12:45:18 -08:00
parent f863616785
commit 675be2b569
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/libtextsecure.js
View file

@ -39312,7 +39312,7 @@ MessageReceiver.prototype = {
this.pending = Promise.resolve(); this.pending = Promise.resolve();
}, },
close: function() { close: function() {
this.wsr.close(); this.socket.close(3000, 'called close');
delete this.listeners; delete this.listeners;
}, },
onopen: function() { onopen: function() {
@ -39322,8 +39322,11 @@ MessageReceiver.prototype = {
console.log('websocket error'); console.log('websocket error');
}, },
onclose: function(ev) { onclose: function(ev) {
console.log('websocket closed', ev.code, ev.reason || '');
if (ev.code === 3000) {
return;
}
var eventTarget = this; var eventTarget = this;
console.log('websocket closed', ev.code);
// possible 403 or network issue. Make an request to confirm // possible 403 or network issue. Make an request to confirm
this.server.getDevices(this.number). this.server.getDevices(this.number).
then(this.connect.bind(this)). // No HTTP error? Reconnect then(this.connect.bind(this)). // No HTTP error? Reconnect

7
libtextsecure/message_receiver.js
View file

@ -32,7 +32,7 @@ MessageReceiver.prototype = {
this.pending = Promise.resolve(); this.pending = Promise.resolve();
}, },
close: function() { close: function() {
this.wsr.close(); this.socket.close(3000, 'called close');
delete this.listeners; delete this.listeners;
}, },
onopen: function() { onopen: function() {
@ -42,8 +42,11 @@ MessageReceiver.prototype = {
console.log('websocket error'); console.log('websocket error');
}, },
onclose: function(ev) { onclose: function(ev) {
console.log('websocket closed', ev.code, ev.reason || '');
if (ev.code === 3000) {
return;
}
var eventTarget = this; var eventTarget = this;
console.log('websocket closed', ev.code);
// possible 403 or network issue. Make an request to confirm // possible 403 or network issue. Make an request to confirm
this.server.getDevices(this.number). this.server.getDevices(this.number).
then(this.connect.bind(this)). // No HTTP error? Reconnect then(this.connect.bind(this)). // No HTTP error? Reconnect