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

Plumb keys into outgoing conflicts

Browse source
This commit is contained in:
lilia 2015-07-20 16:13:17 -07:00
parent 0815a96c1d
commit c28b5408ab
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libtextsecure/sendmessage.js
View file

@ -207,10 +207,10 @@ window.textsecure.messaging = function() {
getKeysForNumber(number, resetDevices)
.then(reloadDevicesAndSend(number, false))
.catch(function(error) {
if (error.message !== "Identity key changed")
if (error.message !== "Identity key changed at session save time")
registerError(number, "Failed to reload device keys", error);
else {
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp, e.identityKey);
registerError(number, "Identity key changed", error);
}
});
@ -218,7 +218,7 @@ window.textsecure.messaging = function() {
} else if (error.message !== "Identity key changed at session save time") {
registerError(number, "Failed to create or send message", error);
} else {
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp, e.identityKey);
registerError(number, "Identity key changed", error);
}
});