浏览代码

hide reactions on deleted and command messages

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 年之前
父节点
当前提交
649d8831ac

+ 8 - 0
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java

@@ -617,6 +617,14 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
         return "voice-message".equals(messageType);
     }
 
+    public boolean isCommandMessage() {
+        return "command".equals(messageType);
+    }
+
+    public boolean isDeletedCommentMessage() {
+        return "comment_deleted".equals(messageType);
+    }
+
     public enum MessageType {
         REGULAR_TEXT_MESSAGE,
         SYSTEM_MESSAGE,

+ 2 - 1
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

@@ -153,7 +153,8 @@ class MessageActionsDialog(
     private fun initEmojiBar() {
         if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") &&
             Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY !=
-            currentConversation?.conversationReadOnlyState
+            currentConversation?.conversationReadOnlyState &&
+            !(message.isCommandMessage || message.isDeletedCommentMessage || message.isDeleted)
         ) {
             checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
             dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener {