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

Fixup account manager task queue

Browse source 
Such that it still pumps tasks if one of them throws/rejects.

// FREEBIE
This commit is contained in:
lilia 2017-02-20 20:11:41 -08:00
parent 51131df23b
commit 38a830c561
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/libtextsecure.js
View file

@ -37946,7 +37946,7 @@ var TextSecureServer = (function() {
var createAccount = this.createAccount.bind(this);
var generateKeys = this.generateKeys.bind(this, 100);
var registrationDone = this.registrationDone.bind(this);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) {
return createAccount(number, verificationCode, identityKeyPair).
then(generateKeys).
@ -37954,8 +37954,6 @@ var TextSecureServer = (function() {
then(registrationDone);
}.bind(this));
}.bind(this));
return this.pending;
},
registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
var createAccount = this.createAccount.bind(this);
@ -37963,7 +37961,7 @@ var TextSecureServer = (function() {
var registrationDone = this.registrationDone.bind(this);
var registerKeys = this.server.registerKeys.bind(this.server);
var getSocket = this.server.getProvisioningSocket.bind(this.server);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
var provisioningCipher = new libsignal.ProvisioningCipher();
return provisioningCipher.getPublicKey().then(function(pubKey) {
return new Promise(function(resolve, reject) {
@ -38010,13 +38008,12 @@ var TextSecureServer = (function() {
then(registerKeys).
then(registrationDone);
}.bind(this));
return this.pending;
},
refreshPreKeys: function() {
var generateKeys = this.generateKeys.bind(this, 100);
var registerKeys = this.server.registerKeys.bind(this.server);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
return this.server.getMyKeys().then(function(preKeyCount) {
console.log('prekey count ' + preKeyCount);
if (preKeyCount < 10) {
@ -38024,10 +38021,9 @@ var TextSecureServer = (function() {
}
}.bind(this));
}.bind(this));
return this.pending;
},
rotateSignedPreKey: function() {
this.pending = this.pending.then(function() {
return this.queueTask(function() {
var signedKeyId = textsecure.storage.get('signedKeyId', 1);
if (typeof signedKeyId != 'number') {
@ -38058,7 +38054,9 @@ var TextSecureServer = (function() {
});
});
}.bind(this));
return this.pending;
},
queueTask: function(task) {
return this.pending = this.pending.then(task, task);
},
cleanSignedPreKeys: function() {
var nextSignedKeyId = textsecure.storage.get('signedKeyId');

16
libtextsecure/account_manager.js
View file

@ -28,7 +28,7 @@
var createAccount = this.createAccount.bind(this);
var generateKeys = this.generateKeys.bind(this, 100);
var registrationDone = this.registrationDone.bind(this);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) {
return createAccount(number, verificationCode, identityKeyPair).
then(generateKeys).
@ -36,8 +36,6 @@
then(registrationDone);
}.bind(this));
}.bind(this));
return this.pending;
},
registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
var createAccount = this.createAccount.bind(this);
@ -45,7 +43,7 @@
var registrationDone = this.registrationDone.bind(this);
var registerKeys = this.server.registerKeys.bind(this.server);
var getSocket = this.server.getProvisioningSocket.bind(this.server);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
var provisioningCipher = new libsignal.ProvisioningCipher();
return provisioningCipher.getPublicKey().then(function(pubKey) {
return new Promise(function(resolve, reject) {
@ -92,13 +90,12 @@
then(registerKeys).
then(registrationDone);
}.bind(this));
return this.pending;
},
refreshPreKeys: function() {
var generateKeys = this.generateKeys.bind(this, 100);
var registerKeys = this.server.registerKeys.bind(this.server);
this.pending = this.pending.then(function() {
return this.queueTask(function() {
return this.server.getMyKeys().then(function(preKeyCount) {
console.log('prekey count ' + preKeyCount);
if (preKeyCount < 10) {
@ -106,10 +103,9 @@
}
}.bind(this));
}.bind(this));
return this.pending;
},
rotateSignedPreKey: function() {
this.pending = this.pending.then(function() {
return this.queueTask(function() {
var signedKeyId = textsecure.storage.get('signedKeyId', 1);
if (typeof signedKeyId != 'number') {
@ -140,7 +136,9 @@
});
});
}.bind(this));
return this.pending;
},
queueTask: function(task) {
return this.pending = this.pending.then(task, task);
},
cleanSignedPreKeys: function() {
var nextSignedKeyId = textsecure.storage.get('signedKeyId');