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

Update identity key after a send error tells us it has changed

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-22 14:03:05 -07:00
parent 22208ec3f8
commit 5e62d0cfd8
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/models/messages.js
View file

@ -211,15 +211,6 @@
}
this.save({sent: true, expirationStartTimestamp: now});
this.sendSyncMessage();
// var error = new Error('OutgoingIdentityKeyError');
// error.name = 'OutgoingIdentityKeyError';
// error.number = result.successfulNumbers[0];
// throw error;
// var error = new Error('OutgoingMessageError');
// error.name = 'OutgoingMessageError';
// throw error;
}.bind(this)).catch(function(result) {
var now = Date.now();
this.trigger('done');
@ -227,19 +218,36 @@
this.set({dataMessage: result.dataMessage});
}
var promises = [];
if (result instanceof Error) {
this.saveErrors(result);
if (result.name === 'SignedPreKeyRotationError') {
getAccountManager().rotateSignedPreKey();
return getAccountManager().rotateSignedPreKey();
}
else if (result.name === 'OutgoingIdentityKeyError') {
promises.push(textsecure.storage.protocol.saveIdentity(
result.number, result.identityKey, false
));
}
} else {
this.saveErrors(result.errors);
if (result.successfulNumbers.length > 0) {
this.set({sent: true, expirationStartTimestamp: now});
this.sendSyncMessage();
promises.push(this.sendSyncMessage());
}
promises = promises.concat(_.map(result.errors, function(error) {
if (error.name === 'OutgoingIdentityKeyError') {
return textsecure.storage.protocol.saveIdentity(
error.number, error.identityKey, false
);
}
}));
}
return Promise.all(promises).then(function() {
this.trigger('send-error', this.get('errors'));
}.bind(this));
}.bind(this));
},