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

Save prekeys optimistically, track confirms, new clean behavior (#1846)

Browse source 
* Re-enable libtextsecure unit tests, get passing, run in CI

* Save prekeys optimistically, track confirmed, new clean behavior

* Eliminate potential conflicts when rotating on startup

* Remove last symlink: get libtextsecure tests running on windows
This commit is contained in:
Scott Nonnenberg 2017-12-01 13:35:39 -08:00 • committed by GitHub
parent 21325bc922
commit c195ba2630
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 433 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/signal_protocol_store.js
View file

@ -240,7 +240,8 @@
pubKey : prekey.get('publicKey'),
privKey : prekey.get('privateKey'),
created_at : prekey.get('created_at'),
keyId : prekey.get('id')
keyId : prekey.get('id'),
confirmed : prekey.get('confirmed'),
});
}).fail(function() {
console.log('Failed to load signed prekey:', keyId);
@ -260,18 +261,20 @@
pubKey : prekey.get('publicKey'),
privKey : prekey.get('privateKey'),
created_at : prekey.get('created_at'),
keyId : prekey.get('id')
keyId : prekey.get('id'),
confirmed : prekey.get('confirmed'),
};
}));
});
});
},
storeSignedPreKey: function(keyId, keyPair) {
storeSignedPreKey: function(keyId, keyPair, confirmed) {
var prekey = new SignedPreKey({
id : keyId,
publicKey : keyPair.pubKey,
privateKey : keyPair.privKey,
created_at : Date.now()
created_at : Date.now(),
confirmed : Boolean(confirmed),
});
return new Promise(function(resolve) {
prekey.save().always(function() {