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

Synchronize contact list names with contact edition on save.

Browse source
This commit is contained in:
Julien Wadel 2025-01-15 18:39:41 +01:00
parent c5c6a328b1
commit 4181d19631
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Linphone/core/call-history/CallHistoryCore.cpp
View file

@ -128,10 +128,8 @@ void CallHistoryCore::setSelf(QSharedPointer<CallHistoryCore> me) {
}; };
if (!ToolModel::findFriendByAddress(mRemoteAddress)) if (!ToolModel::findFriendByAddress(mRemoteAddress))
mCoreModelConnection->makeConnectToModel(&CoreModel::friendCreated, update); mCoreModelConnection->makeConnectToModel(&CoreModel::friendCreated, update);
else { mCoreModelConnection->makeConnectToModel(&CoreModel::friendUpdated, update);
mCoreModelConnection->makeConnectToModel(&CoreModel::friendUpdated, update); mCoreModelConnection->makeConnectToModel(&CoreModel::friendRemoved, &CallHistoryCore::onRemoved);
mCoreModelConnection->makeConnectToModel(&CoreModel::friendRemoved, &CallHistoryCore::onRemoved);
}
} }
ConferenceInfoGui *CallHistoryCore::getConferenceInfoGui() const { ConferenceInfoGui *CallHistoryCore::getConferenceInfoGui() const {

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

@ -221,6 +221,10 @@ void FriendCore::setSelf(QSharedPointer<FriendCore> me) {
updateVerifiedDevicesCount(); updateVerifiedDevicesCount();
}); });
}); });
mCoreModelConnection->makeConnectToCore(&FriendCore::saved, [this]() {
mCoreModelConnection->invokeToModel(
[this, f = mFriendModel->getFriend()]() { emit CoreModel::getInstance()->friendUpdated(f); });
});
} else { // Create } else { // Create
mCoreModelConnection = QSharedPointer<SafeConnection<FriendCore, CoreModel>>( mCoreModelConnection = QSharedPointer<SafeConnection<FriendCore, CoreModel>>(
@ -624,7 +628,7 @@ void FriendCore::save() { // Save Values to model
thisCopy->writeIntoModel(mFriendModel); thisCopy->writeIntoModel(mFriendModel);
thisCopy->deleteLater(); thisCopy->deleteLater();
mVCardString = mFriendModel->getVCardAsString(); mVCardString = mFriendModel->getVCardAsString();
mFriendModelConnection->invokeToCore([this]() { saved(); }); mFriendModelConnection->invokeToCore([this]() { emit saved(); });
setIsSaved(true); setIsSaved(true);
}); });
} else { } else {
@ -648,7 +652,7 @@ void FriendCore::save() { // Save Values to model
thisCopy->deleteLater(); thisCopy->deleteLater();
mVCardString = mFriendModel->getVCardAsString(); mVCardString = mFriendModel->getVCardAsString();
}); });
saved(); emit saved();
}); });
} else { } else {
auto contact = core->createFriend(); auto contact = core->createFriend();

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

@ -58,7 +58,7 @@ FriendModel::FriendModel(const std::shared_ptr<linphone::Friend> &contact, const
connect(this, &FriendModel::givenNameChanged, updateFullName); connect(this, &FriendModel::givenNameChanged, updateFullName);
connect(this, &FriendModel::familyNameChanged, updateFullName); connect(this, &FriendModel::familyNameChanged, updateFullName);
connect(this, &FriendModel::updated, [this]() { emit CoreModel::getInstance()->friendUpdated(mMonitor); }); connect(CoreModel::getInstance().get(), &CoreModel::friendUpdated, this, &FriendModel::onUpdated);
connect(CoreModel::getInstance().get(), &CoreModel::friendRemoved, this, &FriendModel::onRemoved); connect(CoreModel::getInstance().get(), &CoreModel::friendRemoved, this, &FriendModel::onRemoved);
}; };