[network/ruqola] src/widgets/room: Don't show forwardMessageAction when message->isEncryptedMessage()

Git commit 3ad5aecc1a447398692b46ee6f20735e62528c68 by Laurent Montel.
Committed on 07/08/2026 at 17:57.
Pushed by mlaurent into branch 'master'.

Don't show forwardMessageAction when message->isEncryptedMessage()

M  +6    -7    src/widgets/room/messagelistview.cpp

https://invent.kde.org/network/ruqola/-/commit/3ad5aecc1a447398692b46ee6f20735e62528c68

diff --git a/src/widgets/room/messagelistview.cpp b/src/widgets/room/messagelistview.cpp
index d7ca341e1b..83db784e78 100644
--- a/src/widgets/room/messagelistview.cpp
+++ b/src/widgets/room/messagelistview.cpp
@@ -405,6 +405,9 @@ void MessageListView::contextMenuEvent(QContextMenuEvent *event)
         return;
     }
     const Message *message = index.data(MessagesModel::MessagePointer).value<Message *>();
+    if (!message || !mCurrentRocketChatAccount) {
+        return;
+    }
 
     const auto messageType = index.data(MessagesModel::MessageType).value<Message::MessageType>();
     const bool isSystemMessage = (messageType == Message::EncryptedText && !message->hasDescriptedContent()) || (messageType == Message::System)
@@ -504,10 +507,6 @@ void MessageListView::contextMenuEvent(QContextMenuEvent *event)
         slotForwardMessage(index);
     });
 
-    if (!message || !mCurrentRocketChatAccount) {
-        return;
-    }
-
     const QString threadMessageId = index.data(MessagesModel::ThreadMessageId).toString();
     const bool messageIsFollowing = threadMessageId.isEmpty()
         ? (message->replies() && message->replies()->replies().contains(mCurrentRocketChatAccount->userId()))
@@ -635,7 +634,7 @@ void MessageListView::contextMenuEvent(QContextMenuEvent *event)
                 menu.addAction(copyUrlAction);
             }
             menu.addAction(copyLinkToMessageAction);
-            if (!isVideoConferenceMessage) {
+            if (!isVideoConferenceMessage && !message->isEncryptedMessage()) {
                 menu.addAction(forwardMessageAction);
                 menu.addSeparator();
                 // menu.addAction(selectAllAction);
@@ -697,7 +696,7 @@ void MessageListView::contextMenuEvent(QContextMenuEvent *event)
                 menu.addAction(copyUrlAction);
             }
             menu.addAction(copyLinkToMessageAction);
-            if (!isVideoConferenceMessage) {
+            if (!isVideoConferenceMessage && !message->isEncryptedMessage()) {
                 menu.addAction(forwardMessageAction);
                 menu.addSeparator();
                 // menu.addAction(selectAllAction);
@@ -805,7 +804,7 @@ void MessageListView::contextMenuEvent(QContextMenuEvent *event)
             menu.addAction(copyUrlAction);
         }
         menu.addAction(copyLinkToMessageAction);
-        if (!isVideoConferenceMessage) {
+        if (!isVideoConferenceMessage && !message->isEncryptedMessage()) {
             menu.addAction(forwardMessageAction);
             menu.addSeparator();
             // menu.addAction(selectAllAction);