setTrusted() -> setApproved() to dismiss the five-second warning

This change makes sense, since there was already a reference in the code
to the then-nonexistent setApproved()!

FREEBIE
pull/749/head
Scott Nonnenberg 8 years ago
parent 86b1aafe0c
commit 5bba6d3f17

@ -202,7 +202,7 @@
}.bind(this))); }.bind(this)));
} }
}, },
setTrusted: function() { setApproved: function() {
if (!this.isPrivate()) { if (!this.isPrivate()) {
throw new Error('You cannot set a group conversation as trusted. ' + throw new Error('You cannot set a group conversation as trusted. ' +
'You must set individual contacts as trusted.'); 'You must set individual contacts as trusted.');

@ -52,7 +52,7 @@
return this.model.isUntrusted(); return this.model.isUntrusted();
}.bind(this)).then(function(untrusted) { }.bind(this)).then(function(untrusted) {
if (untrusted) { if (untrusted) {
return this.model.setTrusted(); return this.model.setApproved();
} }
}.bind(this)).then(function() { }.bind(this)).then(function() {
this.message.resend(this.outgoingKeyError.number); this.message.resend(this.outgoingKeyError.number);

Loading…
Cancel
Save