From 95bd14bdd46ca8ab9897cac8d7bb2645cc7b7877 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Aug 2025 14:41:45 +0200
Subject: [PATCH] Quick workaround to fix missing favorites from address
 selection fragment

---
 .../viewmodel/ContactsListViewModel.kt        | 16 +++----
 .../viewmodel/AddressSelectionViewModel.kt    | 42 ++++++++++++++++---
 2 files changed, 44 insertions(+), 14 deletions(-)

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 e285932cb..984e6a08d 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
@@ -88,14 +88,6 @@ class ContactsListViewModel
             Log.i("$TAG Magic search contacts available")
             processMagicSearchResults(magicSearch.lastSearch, favourites = false)
         }
-    }
-
-    private val favouritesMagicSearchListener = object : MagicSearchListenerStub() {
-        @WorkerThread
-        override fun onSearchResultsReceived(magicSearch: MagicSearch) {
-            Log.i("$TAG Magic search favourites contacts available")
-            processMagicSearchResults(magicSearch.lastSearch, favourites = true)
-        }
 
         @WorkerThread
         override fun onResultsLimitReached(magicSearch: MagicSearch, sourcesFlag: Int) {
@@ -106,6 +98,14 @@ class ContactsListViewModel
         }
     }
 
+    private val favouritesMagicSearchListener = object : MagicSearchListenerStub() {
+        @WorkerThread
+        override fun onSearchResultsReceived(magicSearch: MagicSearch) {
+            Log.i("$TAG Magic search favourites contacts available")
+            processMagicSearchResults(magicSearch.lastSearch, favourites = true)
+        }
+    }
+
     private val contactsListener = object : ContactsListener {
         @WorkerThread
         override fun onContactsLoaded() {
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
index b16ef77eb..6f24d4d09 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
@@ -73,6 +73,8 @@ abstract class AddressSelectionViewModel
 
     private lateinit var magicSearch: MagicSearch
 
+    private lateinit var favouritesMagicSearch: MagicSearch
+
     private val magicSearchListener = object : MagicSearchListenerStub() {
         @WorkerThread
         override fun onSearchResultsReceived(magicSearch: MagicSearch) {
@@ -93,6 +95,9 @@ abstract class AddressSelectionViewModel
         @WorkerThread
         override fun onContactsLoaded() {
             Log.i("$TAG Contacts have been (re)loaded, updating list")
+            magicSearch.resetSearchCache()
+            favouritesMagicSearch.resetSearchCache()
+
             applyFilter(
                 currentFilter,
                 magicSearchSourceFlags
@@ -113,6 +118,9 @@ abstract class AddressSelectionViewModel
             magicSearch.limitedSearch = true
             magicSearch.searchLimit = corePreferences.magicSearchResultsLimit
             magicSearch.addListener(magicSearchListener)
+
+            favouritesMagicSearch = core.createMagicSearch()
+            favouritesMagicSearch.limitedSearch = false
         }
 
         applyFilter(currentFilter)
@@ -271,6 +279,30 @@ abstract class AddressSelectionViewModel
         }
 
         val favoritesList = arrayListOf<ConversationContactOrSuggestionModel>()
+        val domain = corePreferences.contactsFilter
+        // Make a quick synchronous search for favorites (in case of total results exceed magic search limit to prevent missing ones)
+        // TODO FIXME: to improve like it's done in ContactsListViewModel but will require UI changes
+        val favorites = favouritesMagicSearch.getContactsList(currentFilter, domain, MagicSearch.Source.FavoriteFriends.toInt(), MagicSearch.Aggregation.Friend)
+        for (result in favorites) {
+            val address = result.address
+            val friend = result.friend ?: continue
+
+            val found = favoritesList.find { it.friend == friend }
+            if (found != null) continue
+
+            val mainAddress = address ?: LinphoneUtils.getFirstAvailableAddressForFriend(friend)
+            if (mainAddress != null) {
+                val model = ConversationContactOrSuggestionModel(mainAddress, friend = friend)
+                val avatarModel = coreContext.contactsManager.getContactAvatarModelForFriend(
+                    friend
+                )
+                model.avatarModel.postValue(avatarModel)
+                favoritesList.add(model)
+            } else {
+                Log.w("$TAG Found favorite friend [${friend.name}] in search results but no Address could be found, skipping it")
+            }
+        }
+
         val contactsList = arrayListOf<ConversationContactOrSuggestionModel>()
         val suggestionsList = arrayListOf<ConversationContactOrSuggestionModel>()
 
@@ -278,6 +310,9 @@ abstract class AddressSelectionViewModel
             val address = result.address
             val friend = result.friend
             if (friend != null) {
+                // Starred friends are processed separately to prevent missing some due to magic search limit
+                if (friend.starred) continue
+
                 val found = contactsList.find { it.friend == friend }
                 if (found != null) continue
 
@@ -288,12 +323,7 @@ abstract class AddressSelectionViewModel
                         friend
                     )
                     model.avatarModel.postValue(avatarModel)
-
-                    if (friend.starred) {
-                        favoritesList.add(model)
-                    } else {
-                        contactsList.add(model)
-                    }
+                    contactsList.add(model)
                 } else {
                     Log.w("$TAG Found friend [${friend.name}] in search results but no Address could be found, skipping it")
                 }