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

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

Browse source
This commit is contained in:
Scott Nonnenberg 2017-10-18 11:59:12 -07:00 committed by GitHub
parent f68604c412
commit dabc56d0cf
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/views/conversation_view.js
View file

@ -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();