From 073cd7fd03796a899ee48360d2bcc54c932b29a9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 28 Nov 2022 16:56:28 +0100
Subject: [PATCH] No actions (so far) for redacted events

---
 .../x/features/messages/MessagesViewModel.kt  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
index c5f94e432c..430ceb6d6a 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
@@ -9,6 +9,7 @@ import io.element.android.x.features.messages.model.MessagesItemAction
 import io.element.android.x.features.messages.model.MessagesItemActionsSheetState
 import io.element.android.x.features.messages.model.MessagesTimelineItemState
 import io.element.android.x.features.messages.model.MessagesViewState
+import io.element.android.x.features.messages.model.content.MessagesTimelineItemRedactedContent
 import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.MatrixInstance
 import io.element.android.x.matrix.media.MediaResolver
@@ -104,13 +105,19 @@ class MessagesViewModel(
 
     fun computeActionsSheetState(messagesTimelineItemState: MessagesTimelineItemState.MessageEvent) {
         suspend {
-            val actions = mutableListOf(
-                MessagesItemAction.Forward,
-                MessagesItemAction.Copy,
-            )
-            if (messagesTimelineItemState.isMine) {
-                actions.add(MessagesItemAction.Redact)
-            }
+            val actions =
+                if (messagesTimelineItemState.content is MessagesTimelineItemRedactedContent) {
+                    emptyList()
+                } else {
+                    mutableListOf(
+                        MessagesItemAction.Forward,
+                        MessagesItemAction.Copy,
+                    ).also {
+                        if (messagesTimelineItemState.isMine) {
+                            it.add(MessagesItemAction.Redact)
+                        }
+                    }
+                }
             MessagesItemActionsSheetState(
                 targetItem = messagesTimelineItemState,
                 actions = actions