diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt index de8c27de5..1e9982c5f 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt @@ -153,6 +153,14 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() { } private fun addChatRoom(chatRoom: ChatRoom) { + val exists = chatRooms.value.orEmpty().find { + it.chatRoom.localAddress.weakEqual(chatRoom.localAddress) && it.chatRoom.peerAddress.weakEqual(chatRoom.peerAddress) + } + if (exists != null) { + Log.w("[Chat Rooms] Do not add chat room to list, it's already here") + return + } + val list = arrayListOf() val viewModel = ChatRoomViewModel(chatRoom) list.add(viewModel)