From 2986f7c3a584beaa300ac3d53642d2d8cfdbf8d5 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 29 Mar 2022 18:08:18 +0200 Subject: [PATCH] add system messages for reactions Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/models/json/chat/ChatMessage.java | 7 ++++++- .../json/converters/EnumSystemMessageTypeConverter.kt | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java index e2b693220..4d1b2fcfe 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java @@ -90,6 +90,8 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image public Enum readStatus = ReadStatus.NONE; @JsonField(name = "messageType") public String messageType; + @JsonField(name = "reactions") + public HashMap reactions; public boolean isDownloadingVoiceMessage; public boolean resetVoiceMessage; @@ -657,6 +659,9 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image MATTERBRIDGE_CONFIG_REMOVED, MATTERBRIDGE_CONFIG_ENABLED, MATTERBRIDGE_CONFIG_DISABLED, - CLEARED_CHAT + CLEARED_CHAT, + REACTION, + REACTION_DELETED, + REACTION_REVOKED } } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt index c35d14653..8273f378b 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt @@ -65,6 +65,9 @@ import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.MODERAT import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.OBJECT_SHARED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWORD_REMOVED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWORD_SET +import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.REACTION +import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.REACTION_DELETED +import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.REACTION_REVOKED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.READ_ONLY import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.READ_ONLY_OFF import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_ADDED @@ -161,6 +164,9 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter return MATTERBRIDGE_CONFIG_ENABLED "matterbridge_config_disabled" -> return MATTERBRIDGE_CONFIG_DISABLED "history_cleared" -> return CLEARED_CHAT + "reaction" -> return REACTION + "reaction_deleted" -> return REACTION_DELETED + "reaction_revoked" -> return REACTION_REVOKED else -> return DUMMY } } @@ -214,6 +220,9 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter return "matterbridge_config_enabled" MATTERBRIDGE_CONFIG_DISABLED -> return "matterbridge_config_disabled" CLEARED_CHAT -> return "clear_history" + REACTION -> return "reaction" + REACTION_DELETED -> return "reaction_deleted" + REACTION_REVOKED -> return "reaction_revoked" else -> return "" } }