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

unbreak NPE where megolm's decryptEvent doesn't return a result

Browse Source
This commit is contained in:
Matthew Hodgson
2016-09-15 20:09:41 +01:00
parent 1863af147d
commit 2765720b76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/crypto/index.js
View File

@@ -824,9 +824,9 @@ Crypto.prototype.decryptEvent = function(event) {
});
var r = alg.decryptEvent(event);
var payload = r.result;
payload.keysClaimed = r.keysClaimed;
payload.keysProved = r.keysProved;
if (r.sessionExists) {
payload.keysClaimed = r.keysClaimed;
payload.keysProved = r.keysProved;
return payload;
} else {
// We've got a message for a session we don't have.