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

Fix contacts not showing : avoid using default friends list that can be set to the ldap_friends list (if we get ldap before having any contacts).

Browse source
This commit is contained in:
Julien Wadel 2024-11-06 09:58:03 +01:00
parent 8193c8a4c7
commit 940227dc92
4 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/core/friend/FriendCore.cpp
View file

@ -99,7 +99,7 @@ FriendCore::FriendCore(const std::shared_ptr<linphone::Friend> &contact) : QObje
mStarred = false; mStarred = false;
} }
mIsLdap = ToolModel::friendIsInLdapFriendList(contact); mIsLdap = ToolModel::friendIsInFriendList(ToolModel::getLdapFriendList(), contact);
connect(this, &FriendCore::addressChanged, &FriendCore::allAddressesChanged); connect(this, &FriendCore::addressChanged, &FriendCore::allAddressesChanged);
connect(this, &FriendCore::phoneNumberChanged, &FriendCore::allAddressesChanged); connect(this, &FriendCore::phoneNumberChanged, &FriendCore::allAddressesChanged);
} }
@ -636,7 +636,7 @@ void FriendCore::save() { // Save Values to model
mVCardString = mFriendModel->getVCardAsString(); mVCardString = mFriendModel->getVCardAsString();
auto carddavListForNewFriends = SettingsModel::getCarddavListForNewFriends(); auto carddavListForNewFriends = SettingsModel::getCarddavListForNewFriends();
auto listWhereToAddFriend = carddavListForNewFriends != nullptr ? carddavListForNewFriends auto listWhereToAddFriend = carddavListForNewFriends != nullptr ? carddavListForNewFriends
: core->getDefaultFriendList(); : ToolModel::getAppFriendList();
bool created = (listWhereToAddFriend->addFriend(contact) == linphone::FriendList::Status::OK); bool created = (listWhereToAddFriend->addFriend(contact) == linphone::FriendList::Status::OK);
if (created) { if (created) {
listWhereToAddFriend->updateSubscriptions(); listWhereToAddFriend->updateSubscriptions();

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

@ -276,21 +276,33 @@ bool ToolModel::isLocal(const std::shared_ptr<linphone::Conference> &conference,
return deviceAddress->equal(gruuAddress); return deviceAddress->equal(gruuAddress);
} }
std::shared_ptr<linphone::FriendList> ToolModel::getLdapFriendList() { std::shared_ptr<linphone::FriendList> ToolModel::getFriendList(const std::string &listName) {
auto core = CoreModel::getInstance()->getCore(); auto core = CoreModel::getInstance()->getCore();
auto ldapFriendList = core->getFriendListByName("ldap_friends"); auto friendList = core->getFriendListByName(listName);
if (!ldapFriendList) { if (!friendList) {
ldapFriendList = core->createFriendList(); friendList = core->createFriendList();
ldapFriendList->setDisplayName("ldap_friends"); friendList->setDisplayName(listName);
core->addFriendList(ldapFriendList); core->addFriendList(friendList);
} }
return ldapFriendList; return friendList;
} }
bool ToolModel::friendIsInLdapFriendList(const std::shared_ptr<linphone::Friend> &f) { std::shared_ptr<linphone::FriendList> ToolModel::getAppFriendList() {
auto ldapFriendList = getLdapFriendList(); return getFriendList("app_friends");
for (auto ldapFriend : ldapFriendList->getFriends()) { }
if (f == ldapFriend) return true;
std::shared_ptr<linphone::FriendList> ToolModel::getLdapFriendList() {
return getFriendList("ldap_friends");
}
bool ToolModel::friendIsInFriendList(const std::shared_ptr<linphone::FriendList> &friendList,
const std::shared_ptr<linphone::Friend> &f) {
for (auto contact : friendList->getFriends()) {
if (f == contact) {
qWarning() << Utils::coreStringToAppString(f->getAddress()->asStringUriOnly()) << " / "
<< Utils::coreStringToAppString(contact->getAddress()->asStringUriOnly());
return true;
}
} }
return false; return false;
} }

6
Linphone/model/tool/ToolModel.hpp
View file

@ -59,8 +59,12 @@ public:
linphone::MediaEncryption = linphone::MediaEncryption::None, linphone::MediaEncryption = linphone::MediaEncryption::None,
QString *errorMessage = nullptr); QString *errorMessage = nullptr);
static std::shared_ptr<linphone::FriendList> getFriendList(const std::string &listName);
static std::shared_ptr<linphone::FriendList> getAppFriendList();
static std::shared_ptr<linphone::FriendList> getLdapFriendList(); static std::shared_ptr<linphone::FriendList> getLdapFriendList();
static bool friendIsInLdapFriendList(const std::shared_ptr<linphone::Friend> &f);
static bool friendIsInFriendList(const std::shared_ptr<linphone::FriendList> &friendList,
const std::shared_ptr<linphone::Friend> &f);
private: private:
DECLARE_ABSTRACT_OBJECT DECLARE_ABSTRACT_OBJECT

4
Linphone/tool/Utils.cpp
View file

@ -371,7 +371,7 @@ VariantObject *Utils::findAvatarByAddress(const QString &address) {
if (!data) return nullptr; if (!data) return nullptr;
data->makeRequest([address]() -> QVariant { data->makeRequest([address]() -> QVariant {
QString avatar; QString avatar;
auto defaultFriendList = CoreModel::getInstance()->getCore()->getDefaultFriendList(); auto defaultFriendList = ToolModel::getAppFriendList();
if (!defaultFriendList) return QVariant(); if (!defaultFriendList) return QVariant();
auto linphoneAddr = ToolModel::interpretUrl(address); auto linphoneAddr = ToolModel::interpretUrl(address);
auto linFriend = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr); auto linFriend = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr);
@ -399,7 +399,7 @@ VariantObject *Utils::getFriendAddressSecurityLevel(const QString &address) {
VariantObject *data = new VariantObject(); VariantObject *data = new VariantObject();
if (!data) return nullptr; if (!data) return nullptr;
data->makeRequest([address]() { data->makeRequest([address]() {
auto defaultFriendList = CoreModel::getInstance()->getCore()->getDefaultFriendList(); auto defaultFriendList = ToolModel::getAppFriendList();
if (!defaultFriendList) return QVariant(); if (!defaultFriendList) return QVariant();
auto linphoneAddr = ToolModel::interpretUrl(address); auto linphoneAddr = ToolModel::interpretUrl(address);
auto linFriend = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr); auto linFriend = CoreModel::getInstance()->getCore()->findFriend(linphoneAddr);