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

Fix blank window after unlink

Browse source 
Don't wait for background init before rendering inbox.

If the client detects that it has become unlinked, it will not call
`init()`, never fire the deferredInit, and never render the inbox,
but we want to allow users access to their local messages even if they
have (perhaps temporarily) unlinked the desktop client.

Also, prefer not to extend Backbone.Model until/unless we really need
it.

// FREEBIE
This commit is contained in:
lilia 2017-04-10 12:37:42 -07:00
parent ed4991974b
commit 06e53871b2
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/background.js
View file

@ -121,8 +121,6 @@
SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD
);
deferredInit.resolve(owsDesktopApp);
if (firstRun === true && textsecure.storage.user.getDeviceId() != '1') {
if (!storage.get('theme-setting') && textsecure.storage.get('userAgent') === 'OWI') {
storage.put('theme-setting', 'ios');
@ -301,10 +299,7 @@
});
}
var App = Backbone.Model.extend({
initialize: function(opts) {
this.inboxView = null;
},
window.owsDesktopApp = {
getAppView: function(destWindow) {
var self = this;
@ -327,11 +322,7 @@
}
});
}
});
};
window.owsDesktopApp = new App();
var deferredInit = $.Deferred();
window.initLoading = deferredInit.promise();
})();

5
js/index.js
View file

@ -17,15 +17,12 @@
function render() {
extension.windows.getBackground(function(bg) {
var inboxPromise = bg.initLoading.done(function(owsDesktopApp) {
owsDesktopApp.getAppView(window).then(function(appView) {
bg.owsDesktopApp.getAppView(window).then(function(appView) {
var bodyEl = document.getElementById('signal-container');
bodyEl.innerHTML = "";
bodyEl.append(appView.el);
});
});
});
}
window.addEventListener('onreload', render);