From 973398307c1d98f9d3edc2b893fd3d5adf3de21c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 23 Feb 2026 15:00:27 +0100
Subject: [PATCH] Fixed wrong constraint in call transfer layout & lists not
 updated when switching default account

---
 .../fragment/ConversationsListFragment.kt     |  2 +-
 .../viewmodel/ContactsListViewModel.kt        |  9 ++-----
 .../history/fragment/HistoryListFragment.kt   |  2 +-
 .../meetings/fragment/MeetingsListFragment.kt |  8 +++----
 .../res/layout/call_transfer_fragment.xml     | 24 +++++++++----------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
index 4a7733e4e..c9279d3a6 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
@@ -100,7 +100,7 @@ class ConversationsListFragment : AbstractMainFragment() {
         Log.i(
             "$TAG Default account changed, updating avatar in top bar & re-computing conversations"
         )
-        listViewModel.applyFilter()
+        listViewModel.filter()
     }
 
     override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
index 18a9631fe..f4e3dc8b1 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
@@ -188,10 +188,7 @@ class ContactsListViewModel
     override fun filter() {
         isListFiltered.value = currentFilter.isNotEmpty()
         coreContext.postOnCoreThread {
-            applyFilter(
-                currentFilter,
-                domainFilter
-            )
+            applyFilter(currentFilter, domainFilter)
         }
     }
 
@@ -202,9 +199,7 @@ class ContactsListViewModel
             areAllContactsDisplayed.postValue(domainFilter.isEmpty())
             checkIfDefaultAccountOnDefaultDomain()
 
-            coreContext.postOnMainThread {
-                applyFilter(currentFilter)
-            }
+            applyFilter(currentFilter, domainFilter)
         }
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
index 1c498cebc..e0cd5b6a3 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
@@ -83,7 +83,7 @@ class HistoryListFragment : AbstractMainFragment() {
         Log.i(
             "$TAG Default account changed, updating avatar in top bar & re-computing call logs"
         )
-        listViewModel.applyFilter()
+        listViewModel.filter()
     }
 
     override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
index 1f93f4a25..26fa0f712 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
@@ -77,7 +77,7 @@ class MeetingsListFragment : AbstractMainFragment() {
             Log.i(
                 "$TAG Default account changed, updating avatar in top bar & re-computing meetings list"
             )
-            listViewModel.applyFilter()
+            listViewModel.filter()
         }
     }
 
@@ -176,7 +176,7 @@ class MeetingsListFragment : AbstractMainFragment() {
 
                 meetingViewModelBeingCancelled?.delete()
                 meetingViewModelBeingCancelled = null
-                listViewModel.applyFilter()
+                listViewModel.filter()
 
                 (requireActivity() as GenericActivity).showGreenToast(
                     getString(R.string.meeting_info_deleted_toast),
@@ -201,7 +201,7 @@ class MeetingsListFragment : AbstractMainFragment() {
                         } else {
                             Log.i("$TAG Deleting meeting [${model.id}]")
                             model.delete()
-                            listViewModel.applyFilter()
+                            listViewModel.filter()
                         }
                     }
                 )
@@ -213,7 +213,7 @@ class MeetingsListFragment : AbstractMainFragment() {
         sharedViewModel.forceRefreshMeetingsListEvent.observe(viewLifecycleOwner) {
             it.consume {
                 Log.i("$TAG We were asked to refresh the meetings list, doing it now")
-                listViewModel.applyFilter()
+                listViewModel.filter()
             }
         }
 
diff --git a/app/src/main/res/layout/call_transfer_fragment.xml b/app/src/main/res/layout/call_transfer_fragment.xml
index b52197c9c..aa4d1ba1a 100644
--- a/app/src/main/res/layout/call_transfer_fragment.xml
+++ b/app/src/main/res/layout/call_transfer_fragment.xml
@@ -229,22 +229,22 @@
                         app:layout_constraintTop_toBottomOf="@id/results_limit_reached"
                         app:layout_constraintBottom_toBottomOf="parent" />
 
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
+                        android:id="@+id/fetch_in_progress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        android:visibility="@{viewModel.searchInProgress ? View.VISIBLE : View.GONE}"
+                        app:indicatorColor="?attr/color_main1_500"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/search_bar"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/fetch_in_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                android:visibility="@{viewModel.searchInProgress ? View.VISIBLE : View.GONE}"
-                app:indicatorColor="?attr/color_main1_500"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/search_bar"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/show_numpad"
                 android:onClick="@{() -> viewModel.switchBetweenKeyboardAndNumpad()}"