gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 18:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

hide reactions on deleted and command messages

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-05-09 13:39:39 +02:00
parent 973d13f902
commit 649d8831ac
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
View File

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

3
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

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