From 684dfb53191fd6e4fed5a9c4568ef7aa7085f591 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Mon, 27 Jan 2025 13:01:00 +0100 Subject: [PATCH] debug LINQT-1482 --- .gitlab-ci-files/windows-desktop.yml | 2 +- Linphone/core/search/MagicSearchList.cpp | 2 ++ Linphone/model/friend/FriendModel.cpp | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml index 8b8479c90..b0b9f7cc1 100644 --- a/.gitlab-ci-files/windows-desktop.yml +++ b/.gitlab-ci-files/windows-desktop.yml @@ -90,7 +90,7 @@ .windows-vs2022: extends: .windows-vs - tags: [ "windows-powershell-vs-17-2022" ] + tags: [ "windows-powershell-vs-17-2022-apps" ] .windows-codesigning: extends: .prepare diff --git a/Linphone/core/search/MagicSearchList.cpp b/Linphone/core/search/MagicSearchList.cpp index bf3d28d04..220566e62 100644 --- a/Linphone/core/search/MagicSearchList.cpp +++ b/Linphone/core/search/MagicSearchList.cpp @@ -95,6 +95,7 @@ void MagicSearchList::setSelf(QSharedPointer me) { auto linphoneFriend = it->getFriend(); bool isStored = false; if (linphoneFriend) { + qWarning() << "LINQT-1482 is linphoneFriend"; isStored = (ldapContacts->findFriendByAddress(linphoneFriend->getAddress()) != linphoneFriend); contact = FriendCore::create(linphoneFriend, isStored, it->getSourceFlags()); @@ -116,6 +117,7 @@ void MagicSearchList::setSelf(QSharedPointer me) { address->asString())); // linphone Friend object remove specific address. contacts->append(contact); } else if (!it->getPhoneNumber().empty()) { + qWarning() << "LINQT-1482 searchResultsReceived -> " << (address ? address->asString() : "adress is null"); linphoneFriend = CoreModel::getInstance()->getCore()->createFriend(); linphoneFriend->setAddress(address); contact = FriendCore::create(linphoneFriend, isStored, it->getSourceFlags()); diff --git a/Linphone/model/friend/FriendModel.cpp b/Linphone/model/friend/FriendModel.cpp index a35bc1b5a..6dcb2f436 100644 --- a/Linphone/model/friend/FriendModel.cpp +++ b/Linphone/model/friend/FriendModel.cpp @@ -80,6 +80,7 @@ QDateTime FriendModel::getPresenceTimestamp() const { } void FriendModel::setAddress(const std::shared_ptr &address) { + qWarning() << "LINQT-1482 3 - setAddress" << address->asString(); if (!mMonitor) return; if (address) { mMonitor->setAddress(address); @@ -88,10 +89,15 @@ void FriendModel::setAddress(const std::shared_ptr &address) } std::list> FriendModel::getPhoneNumbers() const { + for (auto &num : mMonitor->getPhoneNumbersWithLabel()) { + qWarning() << "LINQT-1482 3 - getPhoneNumbers" << num->getPhoneNumber(); + if (num) mMonitor->addPhoneNumberWithLabel(num); + } return mMonitor->getPhoneNumbersWithLabel(); } void FriendModel::appendPhoneNumber(const std::shared_ptr &number) { + qWarning() << "LINQT-1482 1 - addPhoneNumberWithLabel" << number->getPhoneNumber(); if (!mMonitor) return; if (number) { mMonitor->addPhoneNumberWithLabel(number); @@ -101,8 +107,10 @@ void FriendModel::appendPhoneNumber(const std::shared_ptr> &numbers) { if (!mMonitor) return; - for (auto &num : numbers) + for (auto &num : numbers) { + qWarning() << "LINQT-1482 2 - addPhoneNumberWithLabel" << num->getPhoneNumber(); if (num) mMonitor->addPhoneNumberWithLabel(num); + } emit phoneNumbersChanged(); } @@ -131,6 +139,7 @@ std::list> FriendModel::getAddresses() const } void FriendModel::appendAddress(const std::shared_ptr &addr) { + qWarning() << "LINQT-1482 3 - appendAddress" << addr->asString(); if (!mMonitor) return; if (addr) { mMonitor->addAddress(addr); @@ -140,8 +149,10 @@ void FriendModel::appendAddress(const std::shared_ptr &addr) void FriendModel::appendAddresses(const std::list> &addresses) { if (!mMonitor) return; - for (auto &addr : addresses) + for (auto &addr : addresses) { if (addr) mMonitor->addAddress(addr); + qWarning() << "LINQT-1482 4 - appendAddresses" << addr->asString(); + } emit addressesChanged(); }