From 572a212fc1c7c11ac3bf50754a39cdb61f0e45ae Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 2 May 2022 22:59:23 +0200 Subject: [PATCH] hide reactions from menu if conversation is read-only Fixes #1956 Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 f4cc74f70..5720c2945 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 @@ -89,8 +89,6 @@ class MessageActionsDialog( ChatMessage.MessageType.SYSTEM_MESSAGE != message.getMessageType() && BuildConfig.DEBUG ) - - initEmojiMore() } override fun onStart() { @@ -153,7 +151,10 @@ class MessageActionsDialog( } private fun initEmojiBar() { - if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions")) { + if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") && + Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY != + currentConversation?.conversationReadOnlyState + ) { checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp) dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener { sendReaction(message, dialogMessageActionsBinding.emojiThumbsUp.text.toString()) @@ -182,6 +183,7 @@ class MessageActionsDialog( dialogMessageActionsBinding.emojiMore.setOnClickListener { dismiss() } + initEmojiMore() dialogMessageActionsBinding.emojiBar.visibility = View.VISIBLE } else { dialogMessageActionsBinding.emojiBar.visibility = View.GONE