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

Fix: Conversation.updateVerified fails when convo not yet in db

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-22 14:01:58 -07:00
parent 9f4fcc5afa
commit 22208ec3f8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/models/conversations.js
View file

@ -59,10 +59,12 @@
if (this.isPrivate()) {
return Promise.all([
textsecure.storage.protocol.getVerified(this.id),
this.fetch()
// new Promise necessary because a fetch will fail if convo not in db yet
new Promise(function(resolve) { this.fetch().always(resolve); }.bind(this))
]).then(function(results) {
var trust = results[0];
return this.save({verified: trust});
// we don't return here because we don't need to wait for this to finish
this.save({verified: trust});
}.bind(this));
} else {
return this.fetchContacts().then(function() {
@ -597,6 +599,7 @@
type : 'private'
});
this.listenTo(c, 'change:verified', this.onMemberVerifiedChange);
// new Promise necessary because a fetch will fail if convo not in db yet
promises.push(new Promise(function(resolve) {
c.fetch().always(resolve);
}));