mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Better handling of network disconnection/reconnection (#1546)

Browse source 
* Ensure that our preload.js setImmediate call finds right function

FREEBIE

* Our own socket close event, better logging, unregistration

FREEBIE

* Return CLOSED for NetworkStatusView if we've fully disconnected

* background.js: Remove messageReceiver = null, log in connect()

A null messageReciever makes the NetworkStatusView think we're online.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-10-06 16:28:13 -07:00 • committed by GitHub
parent 52cc8355a6
commit b64f2969fd
6 changed files with 363 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/background.js
View file

@ -69,7 +69,6 @@
Whisper.events.on('shutdown', function() {
if (messageReceiver) {
messageReceiver.close().then(function() {
messageReceiver = null;
Whisper.events.trigger('shutdown-complete');
});
} else {
@ -147,7 +146,6 @@
messageReceiver.close().then(function() {
Whisper.events.trigger('shutdown-complete');
});
messageReceiver = null;
} else {
Whisper.events.trigger('shutdown-complete');
}
@ -155,6 +153,7 @@
var connectCount = 0;
function connect(firstRun) {
console.log('connect');
window.removeEventListener('online', connect);
window.addEventListener('offline', disconnect);
@ -163,7 +162,6 @@
if (messageReceiver) {
messageReceiver.close();
messageReceiver = null;
}
var USERNAME = storage.get('number_id');
@ -485,7 +483,6 @@
console.log('offline');
if (messageReceiver) {
messageReceiver.close();
messageReceiver = null;
}
}