data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to improve friend research (clean address before insertion in map)

Browse source
This commit is contained in:
Gaelle Braud 2025-05-12 14:30:53 +02:00
parent dad3cb084f
commit c0dbc4b0e5
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Linphone/model/search/MagicSearchModel.cpp
View file

@ -87,8 +87,9 @@ void MagicSearchModel::onSearchResultsReceived(const std::shared_ptr<linphone::M
auto friendsManager = FriendsManager::getInstance(); auto friendsManager = FriendsManager::getInstance();
if (f) { if (f) {
qDebug() << "friend exists, append to unknown map"; qDebug() << "friend exists, append to unknown map";
auto friendAddress = f->getAddress(); auto friendAddress = f->getAddress()->clone();
friendsManager->appendUnknownFriend(friendAddress->clone(), f); friendAddress->clean();
friendsManager->appendUnknownFriend(friendAddress, f);
if (friendsManager->isInOtherAddresses(Utils::coreStringToAppString(friendAddress->asStringUriOnly()))) { if (friendsManager->isInOtherAddresses(Utils::coreStringToAppString(friendAddress->asStringUriOnly()))) {
friendsManager->removeOtherAddress(Utils::coreStringToAppString(friendAddress->asStringUriOnly())); friendsManager->removeOtherAddress(Utils::coreStringToAppString(friendAddress->asStringUriOnly()));
} }

13
Linphone/model/tool/ToolModel.cpp
View file

@ -126,12 +126,13 @@ std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(const QString &
std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr) { std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr) {
auto friendsManager = FriendsManager::getInstance(); auto friendsManager = FriendsManager::getInstance();
linphoneAddr->clean();
QString key = Utils::coreStringToAppString(linphoneAddr->asStringUriOnly()); QString key = Utils::coreStringToAppString(linphoneAddr->asStringUriOnly());
if (friendsManager->isInKnownFriends(key)) { if (friendsManager->isInKnownFriends(key)) {
// qDebug() << key << "have been found in known friend, return it"; // qDebug() << key << "have been found in known friend, return it";
return friendsManager->getKnownFriendAtKey(key); return friendsManager->getKnownFriendAtKey(key);
} else if (friendsManager->isInUnknownFriends(key)) { } else if (friendsManager->isInUnknownFriends(key)) {
// qDebug() << key << "have been found in unknown friend, return it"; // qDebug() << key << "have been found in unknown friend, return it";
return friendsManager->getUnknownFriendAtKey(key); return friendsManager->getUnknownFriendAtKey(key);
} }
auto f = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr); auto f = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr);
@ -139,17 +140,17 @@ std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(std::shared_ptr
if (friendsManager->isInUnknownFriends(key)) { if (friendsManager->isInUnknownFriends(key)) {
friendsManager->removeUnknownFriend(key); friendsManager->removeUnknownFriend(key);
} }
// qDebug() << "found friend, add to known map"; // qDebug() << "found friend, add to known map";
friendsManager->appendKnownFriend(linphoneAddr, f); friendsManager->appendKnownFriend(linphoneAddr, f);
} }
if (!f) { if (!f) {
if (friendsManager->isInOtherAddresses(key)) { if (friendsManager->isInOtherAddresses(key)) {
// qDebug() << "A magic search has already be done for address" << key << "and nothing was found, // qDebug() << "A magic search has already be done for address" << key << "and nothing was found,return ";
// return";
return nullptr; return nullptr;
} }
friendsManager->appendOtherAddress(key); friendsManager->appendOtherAddress(key);
// qDebug() << "Couldn't find friend" << linphoneAddr->asStringUriOnly() << "in core, use magic search"; if (CoreModel::getInstance()->getCore()->getRemoteContactDirectories().empty()) return nullptr;
qDebug() << "Couldn't find friend" << linphoneAddr->asStringUriOnly() << "in core or in maps, use magic search";
CoreModel::getInstance()->searchInMagicSearch(Utils::coreStringToAppString(linphoneAddr->asStringUriOnly()), CoreModel::getInstance()->searchInMagicSearch(Utils::coreStringToAppString(linphoneAddr->asStringUriOnly()),
(int)linphone::MagicSearch::Source::LdapServers | (int)linphone::MagicSearch::Source::LdapServers |
(int)linphone::MagicSearch::Source::RemoteCardDAV, (int)linphone::MagicSearch::Source::RemoteCardDAV,