Don't decrypt redacted messages (#2143)

matrix-org · Jan 31, 2022 · 5e125e6 · 5e125e6
1 parent 1643201
commit 5e125e6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/models/event.ts b/src/models/event.ts
@@ -679,7 +679,12 @@ export class MatrixEvent extends EventEmitter {
     }
 
     public shouldAttemptDecryption() {
-        return this.isEncrypted() && !this.isBeingDecrypted() && !this.clearEvent;
+        if (this.isRedacted()) return false;
+        if (this.isBeingDecrypted()) return false;
+        if (this.clearEvent) return false;
+        if (!this.isEncrypted()) return false;
+
+        return true;
     }
 
     /**