From 9151898a4dddaabe0ecb4da5eb22b55cf10d179c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 6 Jan 2026 16:09:47 +0100
Subject: [PATCH] Disable search direction after latest matching result found

---
 .../chat/viewmodel/ConversationViewModel.kt   | 28 +++++++++++++++----
 .../res/layout/chat_conversation_fragment.xml |  2 +-
 2 files changed, 23 insertions(+), 7 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 ea71e1f1c..73851eedb 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
@@ -98,6 +98,8 @@ class ConversationViewModel
 
     val canSearchDown = MutableLiveData<Boolean>()
 
+    val canSearchUp = MutableLiveData<Boolean>()
+
     val itemToScrollTo = MutableLiveData<Int>()
 
     val isUserScrollingUp = MutableLiveData<Boolean>()
@@ -351,6 +353,7 @@ class ConversationViewModel
         isDisabledBecauseNotSecured.value = false
         searchInProgress.value = false
         canSearchDown.value = false
+        canSearchUp.value = false
         itemToScrollTo.value = -1
     }
 
@@ -382,6 +385,7 @@ class ConversationViewModel
 
     @UiThread
     fun openSearchBar() {
+        canSearchUp.value = true
         searchBarVisible.value = true
         focusSearchBarEvent.value = Event(true)
     }
@@ -393,6 +397,7 @@ class ConversationViewModel
         focusSearchBarEvent.value = Event(false)
         latestMatch = null
         canSearchDown.value = false
+        canSearchUp.value = false
 
         coreContext.postOnCoreThread {
             for (eventLog in eventsList) {
@@ -405,15 +410,19 @@ class ConversationViewModel
 
     @UiThread
     fun searchUp() {
-        coreContext.postOnCoreThread {
-            searchChatMessage(SearchDirection.Up)
+        if (canSearchUp.value == true) {
+            coreContext.postOnCoreThread {
+                searchChatMessage(SearchDirection.Up)
+            }
         }
     }
 
     @UiThread
     fun searchDown() {
-        coreContext.postOnCoreThread {
-            searchChatMessage(SearchDirection.Down)
+        if (canSearchDown.value == true) {
+            coreContext.postOnCoreThread {
+                searchChatMessage(SearchDirection.Down)
+            }
         }
     }
 
@@ -1007,10 +1016,19 @@ class ConversationViewModel
                     val index = eventsList.indexOf(found)
                     itemToScrollTo.postValue(index)
                 }
+                // Disable button as latest result has been reached
+                if (direction == SearchDirection.Down) {
+                    canSearchDown.postValue(false)
+                } else {
+                    canSearchUp.postValue(false)
+                }
                 R.string.conversation_search_no_more_match
             }
             showRedToast(message, R.drawable.magnifying_glass)
         } else {
+            canSearchDown.postValue(true)
+            canSearchUp.postValue(true)
+
             Log.i(
                 "$TAG Found result [${match.chatMessage?.messageId}] while looking up for message with text [$textToSearch] in direction [$direction] starting from message [${latestMatch?.chatMessage?.messageId}]"
             )
@@ -1029,8 +1047,6 @@ class ConversationViewModel
                 itemToScrollTo.postValue(index)
                 searchInProgress.postValue(false)
             }
-
-            canSearchDown.postValue(true)
         }
     }
 
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 580039cfc..8a58a9c2d 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -271,7 +271,7 @@
                     style="@style/icon_top_bar_button_style"
                     android:id="@+id/search_up"
                     android:onClick="@{() -> viewModel.searchUp()}"
-                    android:enabled="@{viewModel.searchFilter.length() > 0}"
+                    android:enabled="@{viewModel.searchFilter.length() > 0 &amp;&amp; viewModel.canSearchUp}"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:src="@drawable/caret_up"