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

enable new ldap list by default #LINQT-1973

Browse source
This commit is contained in:
Gaelle Braud 2025-09-15 10:42:34 +02:00
parent 097c48ebba
commit a819d134fb
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Linphone/model/address-books/ldap/LdapModel.cpp
View file

@ -33,6 +33,7 @@ LdapModel::LdapModel(const std::shared_ptr<linphone::RemoteContactDirectory> &ld
mLdapParamsClone = CoreModel::getInstance()->getCore()->createLdapParams(); mLdapParamsClone = CoreModel::getInstance()->getCore()->createLdapParams();
mLdapParamsClone->setDelay(2000); mLdapParamsClone->setDelay(2000);
mLdapParamsClone->enableTls(true); mLdapParamsClone->enableTls(true);
mLdapParamsClone->setEnabled(true);
mLdap = CoreModel::getInstance()->getCore()->createLdapRemoteContactDirectory(mLdapParamsClone); mLdap = CoreModel::getInstance()->getCore()->createLdapRemoteContactDirectory(mLdapParamsClone);
mLdap->setTimeout(5); mLdap->setTimeout(5);

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

@ -84,7 +84,7 @@ std::shared_ptr<linphone::AudioDevice> ToolModel::findAudioDevice(const QString
QString ToolModel::getDisplayName(const std::shared_ptr<linphone::Address> &address) { QString ToolModel::getDisplayName(const std::shared_ptr<linphone::Address> &address) {
QString displayName; QString displayName;
if (address) { if (address) {
auto linFriend = ToolModel::findFriendByAddress(address); auto linFriend = findFriendByAddress(address);
if (linFriend) { if (linFriend) {
if (displayName.isEmpty()) displayName = Utils::coreStringToAppString(linFriend->getName()); if (displayName.isEmpty()) displayName = Utils::coreStringToAppString(linFriend->getName());
} }
@ -228,7 +228,8 @@ std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(const QString &
else return nullptr; else return nullptr;
} }
std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr) { std::shared_ptr<linphone::Friend>
ToolModel::findFriendByAddress(const std::shared_ptr<linphone::Address> &linphoneAddr) {
auto friendsManager = FriendsManager::getInstance(); auto friendsManager = FriendsManager::getInstance();
linphoneAddr->clean(); linphoneAddr->clean();
QString key = Utils::coreStringToAppString(linphoneAddr->asStringUriOnly()); QString key = Utils::coreStringToAppString(linphoneAddr->asStringUriOnly());

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

@ -55,7 +55,8 @@ public:
std::shared_ptr<linphone::ChatRoom> chatRoom); std::shared_ptr<linphone::ChatRoom> chatRoom);
static std::shared_ptr<linphone::Friend> findFriendByAddress(const QString &address); static std::shared_ptr<linphone::Friend> findFriendByAddress(const QString &address);
static std::shared_ptr<linphone::Friend> findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr); static std::shared_ptr<linphone::Friend>
findFriendByAddress(const std::shared_ptr<linphone::Address> &linphoneAddr);
static bool createCall(const QString &sipAddress, static bool createCall(const QString &sipAddress,
const QVariantMap &options = {}, const QVariantMap &options = {},