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

Dismiss the app loading screen if we failed to connect to socket

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-26 11:32:02 -07:00
parent af2ce56c8d
commit 31d7e652fe
1 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/views/inbox_view.js
View file

@ -102,6 +102,7 @@
this.appLoadingScreen = new Whisper.AppLoadingScreen(); this.appLoadingScreen = new Whisper.AppLoadingScreen();
this.appLoadingScreen.render(); this.appLoadingScreen.render();
this.appLoadingScreen.$el.prependTo(this.el); this.appLoadingScreen.$el.prependTo(this.el);
this.startConnectionListener();
} }
var inboxCollection = getInboxCollection(); var inboxCollection = getInboxCollection();
@ -170,6 +171,27 @@
'click .restart-signal': 'reloadBackgroundPage', 'click .restart-signal': 'reloadBackgroundPage',
'show .lightbox': 'showLightbox' 'show .lightbox': 'showLightbox'
}, },
startConnectionListener: function() {
this.interval = setInterval(function() {
var status = window.getSocketStatus();
switch(status) {
case WebSocket.CONNECTING:
break;
case WebSocket.OPEN:
clearInterval(this.interval);
// if we've connected, we can wait for real empty event
this.interval = null;
break;
case WebSocket.CLOSING:
case WebSocket.CLOSED:
clearInterval(this.interval);
this.interval = null;
// if we failed to connect, we pretend we got an empty event
this.onEmpty();
break;
}
}.bind(this), 1000);
},
onEmpty: function() { onEmpty: function() {
var view = this.appLoadingScreen; var view = this.appLoadingScreen;
if (view) { if (view) {