소스 검색

hide reactions from menu if conversation is read-only

Fixes #1956

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 년 전
부모
커밋
572a212fc1
1개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

+ 5 - 3
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

@@ -89,8 +89,6 @@ class MessageActionsDialog(
                 ChatMessage.MessageType.SYSTEM_MESSAGE != message.getMessageType() &&
                 ChatMessage.MessageType.SYSTEM_MESSAGE != message.getMessageType() &&
                 BuildConfig.DEBUG
                 BuildConfig.DEBUG
         )
         )
-
-        initEmojiMore()
     }
     }
 
 
     override fun onStart() {
     override fun onStart() {
@@ -153,7 +151,10 @@ class MessageActionsDialog(
     }
     }
 
 
     private fun initEmojiBar() {
     private fun initEmojiBar() {
-        if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions")) {
+        if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") &&
+            Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY !=
+            currentConversation?.conversationReadOnlyState
+        ) {
             checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
             checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
             dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener {
             dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener {
                 sendReaction(message, dialogMessageActionsBinding.emojiThumbsUp.text.toString())
                 sendReaction(message, dialogMessageActionsBinding.emojiThumbsUp.text.toString())
@@ -182,6 +183,7 @@ class MessageActionsDialog(
             dialogMessageActionsBinding.emojiMore.setOnClickListener {
             dialogMessageActionsBinding.emojiMore.setOnClickListener {
                 dismiss()
                 dismiss()
             }
             }
+            initEmojiMore()
             dialogMessageActionsBinding.emojiBar.visibility = View.VISIBLE
             dialogMessageActionsBinding.emojiBar.visibility = View.VISIBLE
         } else {
         } else {
             dialogMessageActionsBinding.emojiBar.visibility = View.GONE
             dialogMessageActionsBinding.emojiBar.visibility = View.GONE