From 7ca68b334a625e82a3865b5d1a8d7d50343a5cfe Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Thu, 15 Aug 2024 10:33:23 -0500
Subject: [PATCH] fix
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 2 --
.../java/com/nextcloud/talk/chat/data/model/ChatMessage.kt | 4 +++-
.../json/converters/EnumSystemMessageTypeConverter.kt | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 987d36958..756d89b29 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -162,7 +162,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_BREAKOUT_ROOM
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_MODERATOR
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_RECORDING_STATE
-import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_START_CALL_AFTER_ROOM_SWITCH
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM
@@ -187,7 +186,6 @@ import kotlinx.coroutines.withContext
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import retrofit2.HttpException
-import retrofit2.Response
import java.io.File
import java.io.IOException
import java.net.HttpURLConnection
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
index 1e228ba5b..2c3bf7dad 100644
--- 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/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 6cc84fe2b..962c7adda 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
@@ -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 -> ""
}
}