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

make sure redacted e2e messages are returned as a promise

Browse Source 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
This commit is contained in:
Hubert Chathi
2017-10-24 13:11:48 -04:00
parent a3a3e32e21
commit b373601e13
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/index.js
View File

@@ -770,13 +770,13 @@ Crypto.prototype.encryptEvent = function(event, room) {
*/ */
Crypto.prototype.decryptEvent = function(event) { Crypto.prototype.decryptEvent = function(event) {
if (event.isRedacted()) { if (event.isRedacted()) {
return { return Promise.resolve({
clearEvent: { clearEvent: {
room_id: event.getRoomId(), room_id: event.getRoomId(),
type: "m.room.message", type: "m.room.message",
content: {}, 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);