From 0c104e5a530e467634cbacddaa862c26cd0bf22f Mon Sep 17 00:00:00 2001 From: Beaudan Date: Tue, 5 Feb 2019 10:48:51 +1100 Subject: [PATCH] Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail --- js/views/inbox_view.js | 3 ++- libtextsecure/http-resources.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index 3df51ffcf..6e339e502 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -233,7 +233,8 @@ break; case WebSocket.OPEN: clearInterval(this.interval); - // if we've connected, we can wait for real empty event + // Default to connected, but lokinet is slow so we pretend empty event + this.onEmpty(); this.interval = null; break; case WebSocket.CLOSING: diff --git a/libtextsecure/http-resources.js b/libtextsecure/http-resources.js index 05b5d76e6..bbd36e2d3 100644 --- a/libtextsecure/http-resources.js +++ b/libtextsecure/http-resources.js @@ -64,7 +64,7 @@ if (typeof handleRequest !== 'function') { handleRequest = request => request.respond(404, 'Not found'); } - let connected = false; + let connected = true; const jobQueue = new window.JobQueue(); const processMessages = async messages => {