From 651ddd35d5b69539484cde21a8dfa7eb0f41859f Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 30 Sep 2024 12:07:38 +0200 Subject: [PATCH] fix magic search source --- Linphone/core/search/MagicSearchList.cpp | 6 ++++++ Linphone/view/Control/Display/Contact/ContactListView.qml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Linphone/core/search/MagicSearchList.cpp b/Linphone/core/search/MagicSearchList.cpp index 18690aca..4b9c47a6 100644 --- a/Linphone/core/search/MagicSearchList.cpp +++ b/Linphone/core/search/MagicSearchList.cpp @@ -82,6 +82,12 @@ void MagicSearchList::setSelf(QSharedPointer me) { mModelConnection->makeConnectToCore(&MagicSearchList::lSetSourceFlags, [this](int flags) { mModelConnection->invokeToModel([this, flags]() { mMagicSearch->setSourceFlags(flags); }); }); + mModelConnection->makeConnectToCore(&MagicSearchList::lSetAggregationFlag, + [this](LinphoneEnums::MagicSearchAggregation aggregation) { + mModelConnection->invokeToModel([this, aggregation]() { + mMagicSearch->setAggregationFlag(aggregation); + }); + }); mModelConnection->makeConnectToCore( &MagicSearchList::lSetAggregationFlag, [this](LinphoneEnums::MagicSearchAggregation flag) { mModelConnection->invokeToModel([this, flag]() { mMagicSearch->setAggregationFlag(flag); }); diff --git a/Linphone/view/Control/Display/Contact/ContactListView.qml b/Linphone/view/Control/Display/Contact/ContactListView.qml index 43dbc91b..9db3260b 100644 --- a/Linphone/view/Control/Display/Contact/ContactListView.qml +++ b/Linphone/view/Control/Display/Contact/ContactListView.qml @@ -35,7 +35,7 @@ ListView { property string searchBarText property string searchText: searchBarText.length === 0 ? "*" : searchBarText property var aggregationFlag: LinphoneEnums.MagicSearchAggregation.Friend - property var sourceFlags: LinphoneEnums.MagicSearchSource.Friends | LinphoneEnums.MagicSearchSource.LdapServers + property var sourceFlags: LinphoneEnums.MagicSearchSource.Friends | ((searchText.length > 0 && searchText != "*") || SettingsCpp.syncLdapContacts ? LinphoneEnums.MagicSearchSource.LdapServers : 0) property ConferenceInfoGui confInfoGui @@ -98,7 +98,7 @@ ListView { } aggregationFlag: mainItem.aggregationFlag parentProxy: mainItem.listProxy - sourceFlags: LinphoneEnums.MagicSearchSource.Friends | ((mainItem.searchText.length > 0 && mainItem.searchText != "*") || SettingsCpp.syncLdapContacts ? LinphoneEnums.MagicSearchSource.LdapServers : 0) + sourceFlags: mainItem.sourceFlags onInitialized: { magicSearchProxy.forceUpdate() }