thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Implement non blocking option

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-09-15 12:11:42 -07:00
parent ce315f3f8e
commit aa42139477
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
js/signal_protocol_store.js
View file

@ -261,9 +261,26 @@
var identityKey = new IdentityKey({id: number}); var identityKey = new IdentityKey({id: number});
identityKey.fetch().always(function() { identityKey.fetch().always(function() {
var oldpublicKey = identityKey.get('publicKey'); var oldpublicKey = identityKey.get('publicKey');
resolve(!oldpublicKey || equalArrayBuffers(oldpublicKey, publicKey)); var matches = equalArrayBuffers(oldpublicKey, publicKey);
}); var changed = !!oldpublicKey && !matches;
}); if (changed) {
console.log('Key changed for', identifier);
this.trigger('keychange', identifier);
}
var trusted = !oldpublicKey || matches;
if (trusted) {
resolve(true);
} else if (!storage.get('safety-numbers-approval', true)) {
this.removeIdentityKey(identifier).then(function() {
this.saveIdentity(identifier, publicKey).then(function() {
resolve(true);
});
}.bind(this));
} else {
resolve(false);
}
}.bind(this));
}.bind(this));
}, },
loadIdentityKey: function(identifier) { loadIdentityKey: function(identifier) {
if (identifier === null || identifier === undefined) { if (identifier === null || identifier === undefined) {