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

Remove redundant identity key updates

Browse source 
We were re-saving the key when it did not conflict with the exisiting
value.
This commit is contained in:
lilia 2015-07-09 12:47:16 -07:00
parent 2e272b6894
commit c94c4bc7e0
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
js/axolotl_store.js
View file

@ -263,9 +263,17 @@
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');
if (oldpublicKey && !equalArrayBuffers(oldpublicKey, publicKey)) if (!oldpublicKey) {
throw new Error("Attempted to overwrite a different identity key"); // Lookup failed, or the current key was removed, so save this one.
identityKey.save({publicKey: publicKey}).then(resolve); identityKey.save({publicKey: publicKey}).then(resolve);
} else {
// Key exists, if it matches do nothing, else throw
if (equalArrayBuffers(oldpublicKey, publicKey)) {
resolve();
} else {
throw new Error("Attempted to overwrite a different identity key");
}
}
}); });
}); });
}, },