Skip to content

Commit 7ca68b3

Browse files
committed
fix
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
1 parent 2f251d0 commit 7ca68b3

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
162162
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_BREAKOUT_ROOM
163163
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_MODERATOR
164164
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_RECORDING_STATE
165-
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID
166165
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
167166
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_START_CALL_AFTER_ROOM_SWITCH
168167
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM
@@ -187,7 +186,6 @@ import kotlinx.coroutines.withContext
187186
import org.greenrobot.eventbus.Subscribe
188187
import org.greenrobot.eventbus.ThreadMode
189188
import retrofit2.HttpException
190-
import retrofit2.Response
191189
import java.io.File
192190
import java.io.IOException
193191
import java.net.HttpURLConnection

app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ data class ChatMessage(
407407
BREAKOUT_ROOMS_STARTED,
408408
BREAKOUT_ROOMS_STOPPED,
409409
AVATAR_SET,
410-
AVATAR_REMOVED
410+
AVATAR_REMOVED,
411+
FEDERATED_USER_ADDED,
412+
FEDERATED_USER_REMOVED
411413
}
412414

413415
companion object {

app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.CONVERSA
3131
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_REMOVED
3232
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_SET
3333
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DUMMY
34+
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_ADDED
35+
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_REMOVED
3436
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FILE_SHARED
3537
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_ADDED
3638
import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_REMOVED
@@ -136,6 +138,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
136138
"breakout_rooms_stopped" -> BREAKOUT_ROOMS_STOPPED
137139
"avatar_set" -> AVATAR_SET
138140
"avatar_removed" -> AVATAR_REMOVED
141+
"federated_user_added" -> FEDERATED_USER_ADDED
142+
"federated_user_removed" -> FEDERATED_USER_REMOVED
139143
else -> DUMMY
140144
}
141145
}
@@ -203,6 +207,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
203207
BREAKOUT_ROOMS_STOPPED -> "breakout_rooms_stopped"
204208
AVATAR_SET -> "avatar_set"
205209
AVATAR_REMOVED -> "avatar_removed"
210+
FEDERATED_USER_ADDED -> "federated_user_added"
211+
FEDERATED_USER_REMOVED -> "federated_user_removed"
206212
else -> ""
207213
}
208214
}

0 commit comments

Comments
 (0)