From 9ed2415d1be231dc0c9785262d45108bd2eb61f9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Aug 2024 17:31:30 +0200 Subject: [PATCH] Fixed participants devices events in history when using search & go to original message --- .../linphone/ui/main/chat/viewmodel/ConversationViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index 16dc04b29..5bcf3c3ca 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -900,10 +900,11 @@ class ConversationViewModel @UiThread constructor() : AbstractConversationViewMo @WorkerThread private fun loadMessagesUpTo(targetEvent: EventLog) { + val mask = HistoryFilter.ChatMessage.toInt() or HistoryFilter.InfoNoDevice.toInt() val historyToAdd = chatRoom.getHistoryRangeBetween( targetEvent, eventsList[0].eventLog, - HistoryFilter.None.toInt() + mask ) Log.i( "$TAG Loaded [${historyToAdd.size}] items from history to go to event log [$targetEvent]" @@ -914,7 +915,7 @@ class ConversationViewModel @UiThread constructor() : AbstractConversationViewMo ITEMS_TO_LOAD_BEFORE_SEARCH_RESULT, 0, targetEvent, - HistoryFilter.None.toInt() + mask ) itemToScrollTo.postValue(previousMessages.size - 2) // To go to the item before the target event