From ad87ee0a0f5891d4043b7008a78006d565e80995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Mon, 31 Jan 2022 12:21:13 +0100
Subject: [PATCH] Don't show shield next to deleted messages (#7671)

---
 src/components/views/rooms/EventTile.tsx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 7644e7e759..151ab5f682 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -185,6 +185,10 @@ export function getHandlerTile(ev: MatrixEvent): string {
         return stateEventTileTypes[type];
     }
 
+    if (ev.isRedacted()) {
+        return "messages.MessageEvent";
+    }
+
     return eventTileTypes[type];
 }
 
@@ -762,7 +766,7 @@ export default class EventTile extends React.Component<IProps, IState> {
     };
 
     private async verifyEvent(mxEvent: MatrixEvent): Promise<void> {
-        if (!mxEvent.isEncrypted()) {
+        if (!mxEvent.isEncrypted() || mxEvent.isRedacted()) {
             return;
         }
 
@@ -1020,8 +1024,8 @@ export default class EventTile extends React.Component<IProps, IState> {
             return <E2ePadlockUndecryptable />;
         }
 
-        // event is encrypted, display padlock corresponding to whether or not it is verified
-        if (ev.isEncrypted()) {
+        // event is encrypted and not redacted, display padlock corresponding to whether or not it is verified
+        if (ev.isEncrypted() && !ev.isRedacted()) {
             if (this.state.verified === E2EState.Normal) {
                 return; // no icon if we've not even cross-signed the user
             } else if (this.state.verified === E2EState.Verified) {
@@ -1047,6 +1051,9 @@ export default class EventTile extends React.Component<IProps, IState> {
             if (ev.isState()) {
                 return; // we expect this to be unencrypted
             }
+            if (ev.isRedacted()) {
+                return; // we expect this to be unencrypted
+            }
             // if the event is not encrypted, but it's an e2e room, show the open padlock
             return <E2ePadlockUnencrypted />;
         }
@@ -1611,8 +1618,8 @@ function isMessageEvent(ev: MatrixEvent): boolean {
 }
 
 export function haveTileForEvent(e: MatrixEvent, showHiddenEvents?: boolean): boolean {
-    // Only messages have a tile (black-rectangle) if redacted
-    if (e.isRedacted() && !isMessageEvent(e)) return false;
+    // Only show "Message deleted" tile for message or encrypted events
+    if (e.isRedacted() && !e.isEncrypted() && !isMessageEvent(e)) return false;
 
     // No tile for replacement events since they update the original tile
     if (e.isRelation("m.replace")) return false;