colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix outgoing identity key conflict handling

Browse Source 
// FREEBIE
This commit is contained in:
lilia
2015-07-06 13:40:23 -07:00
parent 9f021a9d7f
commit 8745424d3a
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
background.html
View File

@@ -211,7 +211,7 @@
</script> </script>
<script type='text/x-tmpl-mustache' id='outgoing-key-conflict'> <script type='text/x-tmpl-mustache' id='outgoing-key-conflict'>
<p> <p>
This contact's identity key.has changed. This contact's identity key has changed.
Click to process and display. Click to process and display.
</p> </p>
</script> </script>

6
js/libtextsecure.js
View File

@@ -39945,8 +39945,12 @@ window.textsecure.messaging = function() {
} }
}); });
}); });
} else } else if (error.message !== "Identity key changed at session save time") {
registerError(number, "Failed to create or send message", error); registerError(number, "Failed to create or send message", error);
} else {
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
registerError(number, "Identity key changed", error);
}
}); });
} }

6
libtextsecure/sendmessage.js
View File

@@ -215,8 +215,12 @@ window.textsecure.messaging = function() {
} }
}); });
}); });
} else } else if (error.message !== "Identity key changed at session save time") {
registerError(number, "Failed to create or send message", error); registerError(number, "Failed to create or send message", error);
} else {
error = new textsecure.OutgoingIdentityKeyError(number, message.toArrayBuffer(), timestamp);
registerError(number, "Identity key changed", error);
}
}); });
} }