From ab4acc8f03f654a946a7302dcf90a0eb961051de Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 6 Nov 2024 18:28:01 +0100
Subject: [PATCH] Avoid to make search on initialization. For ContactPage :
 start the search on openning. Remove suggestion title if no one.

---
 .../Display/Contact/ContactListView.qml       |  3 ++-
 Linphone/view/Page/Form/Call/NewCallForm.qml  |  3 ++-
 .../view/Page/Main/Contact/ContactPage.qml    | 22 ++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Linphone/view/Control/Display/Contact/ContactListView.qml b/Linphone/view/Control/Display/Contact/ContactListView.qml
index 5387dbfe4..0bef1540a 100644
--- a/Linphone/view/Control/Display/Contact/ContactListView.qml
+++ b/Linphone/view/Control/Display/Contact/ContactListView.qml
@@ -27,6 +27,7 @@ ListView {
 	property bool showFavoritesOnly: false
 	property bool showDefaultAddress: false
 	property bool showLdapContacts: false
+	property bool searchOnInitialization: false
 
 	property var listProxy: MagicSearchProxy{}
 
@@ -116,7 +117,7 @@ ListView {
 		showLdapContacts: mainItem.showLdapContacts
 		sourceFlags: mainItem.sourceFlags
 		onInitialized: {
-			magicSearchProxy.forceUpdate()
+			if(mainItem.searchOnInitialization) magicSearchProxy.forceUpdate()
 		}
 	}
 
diff --git a/Linphone/view/Page/Form/Call/NewCallForm.qml b/Linphone/view/Page/Form/Call/NewCallForm.qml
index 5dd94123c..918c12efb 100644
--- a/Linphone/view/Page/Form/Call/NewCallForm.qml
+++ b/Linphone/view/Page/Form/Call/NewCallForm.qml
@@ -148,8 +148,8 @@ FocusScope {
 							}
 						}
 						ColumnLayout {
-							visible: contactList.contentHeight > 0
 							spacing: 18 * DefaultStyle.dp
+							visible: contactList.contentHeight > 0
 							Text {
 								text: qsTr("Contacts")
 								font {
@@ -171,6 +171,7 @@ FocusScope {
 						}
 						ColumnLayout {
 							spacing: 18 * DefaultStyle.dp
+							visible: searchList.count > 0
 							Text {
 								text: qsTr("Suggestions")
 								font {
diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml
index d132623da..b0ed7db6f 100644
--- a/Linphone/view/Page/Main/Contact/ContactPage.qml
+++ b/Linphone/view/Page/Main/Contact/ContactPage.qml
@@ -284,6 +284,7 @@ AbstractMainPage {
 								Layout.preferredHeight: contentHeight
 								Control.ScrollBar.vertical.visible: false
 								showFavoritesOnly: true
+								searchOnInitialization: true
 								contactMenuVisible: true
 								searchBarText: searchBar.text
 								listProxy: allFriends
@@ -331,23 +332,18 @@ AbstractMainPage {
 							}
 							ContactListView{
 								id: contactList
-								onCountChanged: {
-									if (initialFriendToDisplay.length !== 0) {
-										if (selectContact(initialFriendToDisplay) != -1) initialFriendToDisplay = ""
-									}
-								}
 								Layout.fillWidth: true
 								Layout.preferredHeight: contentHeight
 								Control.ScrollBar.vertical.visible: false
 								hoverEnabled: mainItem.leftPanelEnabled
 								contactMenuVisible: true
+								searchOnInitialization: true
 								highlightFollowsCurrentItem: true
 								searchBarText: searchBar.text
 								listProxy: allFriends
-								Connections {
-									target: contactList.model
-									function onFriendCreated(index) {
-										contactList.currentIndex = index
+								onCountChanged: {
+									if (initialFriendToDisplay.length !== 0) {
+										if (selectContact(initialFriendToDisplay) != -1) initialFriendToDisplay = ""
 									}
 								}
 								onSelectedContactChanged: {
@@ -359,6 +355,12 @@ AbstractMainPage {
 								onContactDeletionRequested: (contact) => {
 									mainItem.deleteContact(contact)
 								}
+								Connections {
+									target: contactList.model
+									function onFriendCreated(index) {
+										contactList.currentIndex = index
+									}
+								}
 							}
 						}
 					}
@@ -916,4 +918,4 @@ AbstractMainPage {
 			}
 		}
 	}
-}
\ No newline at end of file
+}