mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update chat participant display name when friend created/updated/removed #LINQT-2347

Browse source
This commit is contained in:
Gaelle Braud 2026-01-15 16:40:17 +01:00
parent c756217b16
commit 83675dd9bb
4 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Linphone/core/participant/ParticipantCore.cpp
View file

@ -20,10 +20,8 @@
#include <QQmlApplicationEngine>
#include "core/App.hpp"
#include "ParticipantCore.hpp"
// #include "ParticipantDeviceList.hpp"
#include "core/App.hpp"
#include "model/participant/ParticipantModel.hpp"
#include "model/tool/ToolModel.hpp"
#include "tool/Utils.hpp"
@ -77,6 +75,48 @@ void ParticipantCore::setSelf(QSharedPointer<ParticipantCore> me) {
QTimer::singleShot(secs * 1000, this, &ParticipantCore::onEndOfInvitation);
});
connect(this, &ParticipantCore::sipAddressChanged, this, &ParticipantCore::updateIsMe);
auto update = [this, remoteAddress = mSipAddress](const std::shared_ptr<linphone::Friend> &updatedFriend) {
bool isThisFriend = false;
std::shared_ptr<linphone::Address> friendAddress;
auto participantAddress = mParticipantModel->getAddress();
for (auto address : updatedFriend->getAddresses()) {
if (address->weakEqual(participantAddress)) {
isThisFriend = true;
friendAddress = address;
break;
}
}
if (isThisFriend) {
auto displayName = friendAddress->getDisplayName();
mCoreModelConnection->invokeToCore([this, displayName] {
auto me = mCoreModelConnection->mCore.mQData; // Locked from previous call.
setDisplayName(Utils::coreStringToAppString(displayName));
});
}
};
auto onRemoved = [this](const std::shared_ptr<linphone::Friend> &updatedFriend) {
bool isThisFriend = false;
std::shared_ptr<linphone::Address> friendAddress;
auto participantAddress = mParticipantModel->getAddress();
for (auto address : updatedFriend->getAddresses()) {
if (address->weakEqual(participantAddress)) {
isThisFriend = true;
friendAddress = address;
break;
}
}
if (isThisFriend) {
auto displayName = ToolModel::getDisplayName(participantAddress);
mCoreModelConnection->invokeToCore([this, displayName] {
auto me = mCoreModelConnection->mCore.mQData; // Locked from previous call.
setDisplayName(displayName);
});
}
};
mCoreModelConnection = SafeConnection<ParticipantCore, CoreModel>::create(me, CoreModel::getInstance());
mCoreModelConnection->makeConnectToModel(&CoreModel::friendCreated, update);
mCoreModelConnection->makeConnectToModel(&CoreModel::friendUpdated, update);
mCoreModelConnection->makeConnectToModel(&CoreModel::friendRemoved, onRemoved);
}
LinphoneEnums::SecurityLevel ParticipantCore::getSecurityLevel() const {

1
Linphone/core/participant/ParticipantCore.hpp
View file

@ -107,6 +107,7 @@ signals:
private:
std::shared_ptr<ParticipantModel> mParticipantModel;
QSharedPointer<SafeConnection<ParticipantCore, ParticipantModel>> mParticipantConnection;
QSharedPointer<SafeConnection<ParticipantCore, CoreModel>> mCoreModelConnection;
QList<QVariant> mParticipantDevices;

4
Linphone/model/participant/ParticipantModel.cpp
View file

@ -52,6 +52,10 @@ QString ParticipantModel::getSipAddress() const {
return Utils::coreStringToAppString(mParticipant->getAddress()->asString());
}
std::shared_ptr<const linphone::Address> ParticipantModel::getAddress() const {
return mParticipant ? mParticipant->getAddress() : nullptr;
}
QDateTime ParticipantModel::getCreationTime() const {
return QDateTime::fromSecsSinceEpoch(mParticipant->getCreationTime());
}

1
Linphone/model/participant/ParticipantModel.hpp
View file

@ -40,6 +40,7 @@ public:
~ParticipantModel();
QString getSipAddress() const;
std::shared_ptr<const linphone::Address> getAddress() const;
QDateTime getCreationTime() const;
bool getAdminStatus() const;
bool isFocus() const;