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

Fix crash with CardDav

Browse source
This commit is contained in:
Christophe Deschamps 2025-06-05 15:04:44 +02:00
parent f4e3db8a07
commit 6ff3cc0ae7
2 changed files with 58 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Linphone/model/friend/FriendModel.cpp
View file

@ -22,6 +22,7 @@
#include "core/path/Paths.hpp" #include "core/path/Paths.hpp"
#include "model/core/CoreModel.hpp" #include "model/core/CoreModel.hpp"
#include "model/setting/SettingsModel.hpp"
#include "model/tool/ToolModel.hpp" #include "model/tool/ToolModel.hpp"
#include "tool/Utils.hpp" #include "tool/Utils.hpp"
#include "tool/providers/AvatarProvider.hpp" #include "tool/providers/AvatarProvider.hpp"
@ -394,6 +395,11 @@ bool FriendModel::isThisFriend(const std::shared_ptr<linphone::Friend> &data) {
void FriendModel::remove() { void FriendModel::remove() {
if (!mMonitor) return; if (!mMonitor) return;
auto friendList = mMonitor->getFriendList();
if (friendList && friendList == SettingsModel::getCardDAVListForNewFriends()) {
friendList->removeFriend(mMonitor);
friendList->synchronizeFriendsFromServer();
}
auto temp = mMonitor; auto temp = mMonitor;
temp->remove(); // mMonitor become null temp->remove(); // mMonitor become null
emit CoreModel::getInstance()->friendRemoved(temp); emit CoreModel::getInstance()->friendRemoved(temp);

95
Linphone/model/friend/FriendsManager.cpp
View file

@ -30,38 +30,47 @@ std::shared_ptr<FriendsManager> FriendsManager::gFriendsManager;
FriendsManager::FriendsManager(QObject *parent) : QObject(parent) { FriendsManager::FriendsManager(QObject *parent) : QObject(parent) {
moveToThread(CoreModel::getInstance()->thread()); moveToThread(CoreModel::getInstance()->thread());
connect(CoreModel::getInstance().get(), &CoreModel::friendRemoved, this, [this] (const std::shared_ptr<linphone::Friend> &f) { connect(CoreModel::getInstance().get(), &CoreModel::friendRemoved, this,
auto key = mKnownFriends.key(QVariant::fromValue(f), nullptr); [this](const std::shared_ptr<linphone::Friend> &f) {
if (key != nullptr) { auto key = mKnownFriends.key(QVariant::fromValue(f), nullptr);
mKnownFriends.remove(key); if (key != nullptr) {
} mKnownFriends.remove(key);
auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr); }
if (unknown != nullptr) { auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr);
mUnknownFriends.remove(unknown); if (unknown != nullptr) {
} mUnknownFriends.remove(unknown);
auto address = QString::fromStdString(f->getAddress()->asStringUriOnly()); }
mOtherAddresses.removeAll(address); if (f->getAddress()) {
}); auto address = QString::fromStdString(f->getAddress()->asStringUriOnly());
connect(CoreModel::getInstance().get(), &CoreModel::friendCreated, this, [this] (const std::shared_ptr<linphone::Friend> &f) { mOtherAddresses.removeAll(address);
auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr); }
if (unknown != nullptr) { });
mUnknownFriends.remove(unknown); connect(CoreModel::getInstance().get(), &CoreModel::friendCreated, this,
} [this](const std::shared_ptr<linphone::Friend> &f) {
auto address = QString::fromStdString(f->getAddress()->asStringUriOnly()); auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr);
mOtherAddresses.removeAll(address); if (unknown != nullptr) {
}); mUnknownFriends.remove(unknown);
connect(CoreModel::getInstance().get(), &CoreModel::friendUpdated, this, [this] (const std::shared_ptr<linphone::Friend> &f) { }
auto key = mKnownFriends.key(QVariant::fromValue(f), nullptr); if (f->getAddress()) {
if (key != nullptr) { auto address = QString::fromStdString(f->getAddress()->asStringUriOnly());
mKnownFriends.remove(key); mOtherAddresses.removeAll(address);
} }
auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr); });
if (unknown != nullptr) { connect(CoreModel::getInstance().get(), &CoreModel::friendUpdated, this,
mUnknownFriends.remove(unknown); [this](const std::shared_ptr<linphone::Friend> &f) {
} auto key = mKnownFriends.key(QVariant::fromValue(f), nullptr);
auto address = QString::fromStdString(f->getAddress()->asStringUriOnly()); if (key != nullptr) {
mOtherAddresses.removeAll(address); mKnownFriends.remove(key);
}); }
auto unknown = mUnknownFriends.key(QVariant::fromValue(f), nullptr);
if (unknown != nullptr) {
mUnknownFriends.remove(unknown);
}
if (f->getAddress()) {
auto address = QString::fromStdString(f->getAddress()->asStringUriOnly());
mOtherAddresses.removeAll(address);
}
});
} }
FriendsManager::~FriendsManager() { FriendsManager::~FriendsManager() {
@ -89,31 +98,32 @@ QStringList FriendsManager::getOtherAddresses() const {
return mOtherAddresses; return mOtherAddresses;
} }
std::shared_ptr<linphone::Friend> FriendsManager::getKnownFriendAtKey(const QString& key) { std::shared_ptr<linphone::Friend> FriendsManager::getKnownFriendAtKey(const QString &key) {
if (isInKnownFriends(key)) { if (isInKnownFriends(key)) {
return mKnownFriends.value(key).value<std::shared_ptr<linphone::Friend>>(); return mKnownFriends.value(key).value<std::shared_ptr<linphone::Friend>>();
} else return nullptr; } else return nullptr;
} }
std::shared_ptr<linphone::Friend> FriendsManager::getUnknownFriendAtKey(const QString& key) { std::shared_ptr<linphone::Friend> FriendsManager::getUnknownFriendAtKey(const QString &key) {
if (isInUnknownFriends(key)) { if (isInUnknownFriends(key)) {
return mUnknownFriends.value(key).value<std::shared_ptr<linphone::Friend>>(); return mUnknownFriends.value(key).value<std::shared_ptr<linphone::Friend>>();
} else return nullptr; } else return nullptr;
} }
bool FriendsManager::isInKnownFriends(const QString& key) { bool FriendsManager::isInKnownFriends(const QString &key) {
return mKnownFriends.contains(key); return mKnownFriends.contains(key);
} }
bool FriendsManager::isInUnknownFriends(const QString& key) { bool FriendsManager::isInUnknownFriends(const QString &key) {
return mUnknownFriends.contains(key); return mUnknownFriends.contains(key);
} }
bool FriendsManager::isInOtherAddresses(const QString& key) { bool FriendsManager::isInOtherAddresses(const QString &key) {
return mOtherAddresses.contains(key); return mOtherAddresses.contains(key);
} }
void FriendsManager::appendKnownFriend(std::shared_ptr<linphone::Address> address, std::shared_ptr<linphone::Friend> f) { void FriendsManager::appendKnownFriend(std::shared_ptr<linphone::Address> address,
std::shared_ptr<linphone::Friend> f) {
auto key = Utils::coreStringToAppString(address->asStringUriOnly()); auto key = Utils::coreStringToAppString(address->asStringUriOnly());
if (mKnownFriends.contains(key)) { if (mKnownFriends.contains(key)) {
qDebug() << "friend is already in konwn list, return"; qDebug() << "friend is already in konwn list, return";
@ -122,8 +132,8 @@ void FriendsManager::appendKnownFriend(std::shared_ptr<linphone::Address> addres
mKnownFriends.insert(key, QVariant::fromValue(f)); mKnownFriends.insert(key, QVariant::fromValue(f));
} }
void FriendsManager::appendUnknownFriend(std::shared_ptr<linphone::Address> address,
void FriendsManager::appendUnknownFriend(std::shared_ptr<linphone::Address> address, std::shared_ptr<linphone::Friend> f) { std::shared_ptr<linphone::Friend> f) {
auto key = Utils::coreStringToAppString(address->asStringUriOnly()); auto key = Utils::coreStringToAppString(address->asStringUriOnly());
if (mUnknownFriends.contains(key)) { if (mUnknownFriends.contains(key)) {
qDebug() << "friend is already in unkonwn list, return"; qDebug() << "friend is already in unkonwn list, return";
@ -132,7 +142,6 @@ void FriendsManager::appendUnknownFriend(std::shared_ptr<linphone::Address> addr
mUnknownFriends.insert(key, QVariant::fromValue(f)); mUnknownFriends.insert(key, QVariant::fromValue(f));
} }
void FriendsManager::appendOtherAddress(QString address) { void FriendsManager::appendOtherAddress(QString address) {
if (mOtherAddresses.contains(address)) { if (mOtherAddresses.contains(address)) {
qDebug() << "friend is already in other addresses, return"; qDebug() << "friend is already in other addresses, return";
@ -141,10 +150,10 @@ void FriendsManager::appendOtherAddress(QString address) {
mOtherAddresses.append(address); mOtherAddresses.append(address);
} }
void FriendsManager::removeUnknownFriend(const QString& key) { void FriendsManager::removeUnknownFriend(const QString &key) {
mUnknownFriends.remove(key); mUnknownFriends.remove(key);
} }
void FriendsManager::removeOtherAddress(const QString& key) { void FriendsManager::removeOtherAddress(const QString &key) {
mOtherAddresses.removeAll(key); mOtherAddresses.removeAll(key);
} }