mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-20 21:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent duplicated chat rooms in conversations list when added/removed/added

Browse source
This commit is contained in:
Sylvain Berfini 2024-08-13 14:59:43 +02:00
parent 415da6f03d
commit 2104d79e1c
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -526,6 +526,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
binding.eventsList.scrollToPosition(position)
} else {
Log.w("$TAG Failed to find matching message in adapter's items!")
// TODO FIXME: load original message & messages in between, then scroll to it
}
}
}

19
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
View file

@ -189,8 +189,16 @@ class ConversationsListViewModel @UiThread constructor() : AbstractMainViewModel
}
val currentList = conversations.value.orEmpty()
val newList = arrayListOf<ConversationModel>()
val peerAddress = chatRoom.peerAddress
val found = currentList.find {
it.chatRoom.peerAddress.weakEqual(peerAddress)
}
if (found != null) {
Log.w("$TAG Created chat room is already in the list, skipping")
return
}
val newList = arrayListOf<ConversationModel>()
val model = createConversationModel(chatRoom)
if (model != null) {
newList.add(model)
@ -207,18 +215,21 @@ class ConversationsListViewModel @UiThread constructor() : AbstractMainViewModel
@WorkerThread
private fun removeChatRoom(chatRoom: ChatRoom) {
val currentList = conversations.value.orEmpty()
val peerAddress = chatRoom.peerAddress
val found = currentList.find {
it.chatRoom == chatRoom
it.chatRoom.peerAddress.weakEqual(peerAddress)
}
if (found != null) {
val newList = arrayListOf<ConversationModel>()
newList.addAll(currentList)
newList.remove(found)
found.destroy()
Log.i("$TAG Removing chat room from list")
Log.i("$TAG Removing chat room [${peerAddress.asStringUriOnly()}] from list")
conversations.postValue(newList)
} else {
Log.w("$TAG Failed to find item in list matching deleted chat room")
Log.w(
"$TAG Failed to find item in list matching deleted chat room peer address [${peerAddress.asStringUriOnly()}]"
)
}
showGreenToastEvent.postValue(