Merge pull request #4086 from nextcloud/issue-4072-federated-accept-m…

…essage-should-be-system UI Fix: federated acceptance messages look like system messages
nextcloud · Aug 21, 2024 · bb64e04 · bb64e04
2 parents b88fab9 + 1c52acc
commit bb64e04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt
@@ -407,7 +407,9 @@ data class ChatMessage(
         BREAKOUT_ROOMS_STARTED,
         BREAKOUT_ROOMS_STOPPED,
         AVATAR_SET,
-        AVATAR_REMOVED
+        AVATAR_REMOVED,
+        FEDERATED_USER_ADDED,
+        FEDERATED_USER_REMOVED
     }
 
     companion object {

diff --git a/...src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/...src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt
@@ -31,6 +31,8 @@ import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.CONVERSA
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_REMOVED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_SET
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DUMMY
+import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_ADDED
+import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_REMOVED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FILE_SHARED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_ADDED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_REMOVED
@@ -136,6 +138,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
             "breakout_rooms_stopped" -> BREAKOUT_ROOMS_STOPPED
             "avatar_set" -> AVATAR_SET
             "avatar_removed" -> AVATAR_REMOVED
+            "federated_user_added" -> FEDERATED_USER_ADDED
+            "federated_user_removed" -> FEDERATED_USER_REMOVED
             else -> DUMMY
         }
     }
@@ -203,6 +207,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
             BREAKOUT_ROOMS_STOPPED -> "breakout_rooms_stopped"
             AVATAR_SET -> "avatar_set"
             AVATAR_REMOVED -> "avatar_removed"
+            FEDERATED_USER_ADDED -> "federated_user_added"
+            FEDERATED_USER_REMOVED -> "federated_user_removed"
             else -> ""
         }
     }