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

Pass in non/blockingApproval args to saveIdentity

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
js/models/conversations.js
View file

@ -504,7 +504,7 @@
throw 'No conflicts to resolve'; 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 promise = Promise.resolve();
var conflicts = this.messageCollection.filter(function(message) { var conflicts = this.messageCollection.filter(function(message) {
return message.hasKeyConflict(number); return message.hasKeyConflict(number);

2
libtextsecure/account_manager.js
View file

@ -204,7 +204,7 @@
// update our own identity key, which may have changed // update our own identity key, which may have changed
// if we're relinking after a reinstall on the master device // if we're relinking after a reinstall on the master device
var putIdentity = textsecure.storage.protocol.saveIdentity.bind( var putIdentity = textsecure.storage.protocol.saveIdentity.bind(
null, number, identityKeyPair.pubKey null, number, identityKeyPair.pubKey, true, true
); );
textsecure.storage.protocol.removeIdentityKey(number).then(putIdentity, putIdentity); textsecure.storage.protocol.removeIdentityKey(number).then(putIdentity, putIdentity);