Load profiles for a conversation without blocking convo load (#1570)

pull/749/head
Scott Nonnenberg 8 years ago committed by GitHub
parent f68604c412
commit dabc56d0cf

@ -470,11 +470,9 @@
// messages from the database, then ensure that the loading screen is only
// dismissed when that is complete.
var messagesLoaded = this.inProgressFetch || Promise.resolve();
messagesLoaded = messagesLoaded.then(function() {
return this.model.decryptOldIncomingKeyErrors();
}.bind(this));
Promise.all([this.statusFetch, messagesLoaded])
messagesLoaded
.then(this.model.decryptOldIncomingKeyErrors.bind(this))
.then(this.onLoaded.bind(this), this.onLoaded.bind(this));
this.view.resetScrollPosition();

Loading…
Cancel
Save