matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Merge pull request #554 from uhoreg/e2e_redact

Browse Source 
don't try to decrypt a redacted message (fixes vector-im/riot-web#3744)
This commit is contained in:
Richard van der Hoff
2017-10-24 21:02:01 +01:00
committed by GitHub
parent 7a90096077 b373601e13
commit da7104b00d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/index.js
View File

@@ -769,6 +769,15 @@ Crypto.prototype.encryptEvent = function(event, room) {
* is a problem decrypting the event. * is a problem decrypting the event.
*/ */
Crypto.prototype.decryptEvent = function(event) { Crypto.prototype.decryptEvent = function(event) {
if (event.isRedacted()) {
return Promise.resolve({
clearEvent: {
room_id: event.getRoomId(),
type: "m.room.message",
content: {},
},
});
}
const content = event.getWireContent(); const content = event.getWireContent();
const alg = this._getRoomDecryptor(event.getRoomId(), content.algorithm); const alg = this._getRoomDecryptor(event.getRoomId(), content.algorithm);
return alg.decryptEvent(event); return alg.decryptEvent(event);