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

Remove blockingApproval

Browse source 
// FREEBIE
This commit is contained in:
lilia 2017-06-12 12:18:14 -07:00 • committed by Scott Nonnenberg
parent 53e7e1be3a
commit c6bfdec84d
4 changed files with 8 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/models/conversations.js
View file

@ -355,7 +355,7 @@
var identityKey = dcodeIO.ByteBuffer.wrap(profile.identityKey, 'base64').toArrayBuffer();
return textsecure.storage.protocol.saveIdentity(
id, identityKey, storage.get('safety-numbers-approval', true), false
id, identityKey, false
);
});
},
@ -525,7 +525,7 @@
throw 'No conflicts to resolve';
}
return textsecure.storage.protocol.saveIdentity(number, identityKey, true, true).then(function() {
return textsecure.storage.protocol.saveIdentity(number, identityKey, true).then(function() {
var promise = Promise.resolve();
var conflicts = this.messageCollection.filter(function(message) {
return message.hasKeyConflict(number);