matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-23 22:42:10 +03:00
Code Activity

differentiate errors a bit better

Browse Source
This commit is contained in:
Matthew Hodgson
2015-07-23 10:52:14 -07:00
parent 0737b80850
commit 14a7ff3e04
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/client.js
View File

@@ -776,7 +776,7 @@ function _decryptMessage(client, event) {
if (client.sessionStore === null || !CRYPTO_ENABLED) {
// End to end encryption isn't enabled if we don't have a session
// store.
return _badEncryptedMessage(event, "Encryption not enabled");
return _badEncryptedMessage(event, "**Encryption not enabled**");
}
var content = event.getContent();
@@ -785,10 +785,10 @@ function _decryptMessage(client, event) {
var ciphertext = content.ciphertext;
if (!ciphertext) {
return _badEncryptedMessage(event, "Missing ciphertext");
return _badEncryptedMessage(event, "**Missing ciphertext**");
}
if (!(client.deviceCurve25519Key in content.ciphertext)) {
return _badEncryptedMessage(event, "Not included in recipients");
return _badEncryptedMessage(event, "**Not included in recipients**");
}
var message = content.ciphertext[client.deviceCurve25519Key];
var sessions = client.sessionStore.getEndToEndSessions(deviceKey);
@@ -856,7 +856,7 @@ function _decryptMessage(client, event) {
content: payload.content
}, "encrypted");
} else {
return _badEncryptedMessage(event, "Bad Encrypted Message");
return _badEncryptedMessage(event, "**Bad Encrypted Message**");
}
}
}