Pass in non/blockingApproval args to saveIdentity

Multiple cases here:
1. setting our own key on registration
1. changing identities from a safety number change dialog

Note that removeIdentityKey runs before saveIdentity, so we'll always end up
with firstUse: true on our own key.

// FREEBIE
This commit is contained in:
lilia 2017-05-24 15:05:18 -07:00 committed by Scott Nonnenberg
parent 3ca511a10a
commit 4e4aedd4ba
2 changed files with 2 additions and 2 deletions

View file

@ -504,7 +504,7 @@
throw 'No conflicts to resolve';
}
return textsecure.storage.protocol.saveIdentity(number, identityKey).then(function() {
return textsecure.storage.protocol.saveIdentity(number, identityKey, true, true).then(function() {
var promise = Promise.resolve();
var conflicts = this.messageCollection.filter(function(message) {
return message.hasKeyConflict(number);