From b603031011c5fef7f1bfceb6f275e2fde0017566 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 10 May 2022 18:08:07 +0200 Subject: [PATCH] hide "reply" and "forward" when chatPermission is missing "forward" is also hidden because this would need bigger changes regarding the state of the hasChatPermission variable inside the ChatController.kt Signed-off-by: Marcel Hibbe --- .../java/com/nextcloud/talk/controllers/ChatController.kt | 2 +- .../com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 70e999f8c..2d67c5b12 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -587,7 +587,7 @@ class ChatController(args: Bundle) : } } - if (context != null) { + if (context != null && hasChatPermission && !isReadOnlyConversation()) { val messageSwipeController = MessageSwipeCallback( activity!!, object : MessageSwipeActions { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt index 38ffb2a8d..44f0e0130 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt @@ -74,7 +74,7 @@ class MessageActionsDialog( initEmojiBar(hasChatPermission) initMenuItemCopy(!message.isDeleted) - initMenuReplyToMessage(message.replyable) + initMenuReplyToMessage(message.replyable && hasChatPermission) initMenuReplyPrivately( message.replyable && hasUserId(user) && @@ -83,7 +83,8 @@ class MessageActionsDialog( ) initMenuDeleteMessage(showMessageDeletionButton) initMenuForwardMessage( - ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getMessageType() && + hasChatPermission && + ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getMessageType() && !(message.isDeletedCommentMessage || message.isDeleted) ) initMenuMarkAsUnread(