fix display name when address in contacts
This commit is contained in:
parent
b1521ebf04
commit
0afdc6d6d7
1 changed files with 10 additions and 3 deletions
|
|
@ -79,10 +79,17 @@ std::shared_ptr<linphone::AudioDevice> ToolModel::findAudioDevice(const QString
|
||||||
QString ToolModel::getDisplayName(const std::shared_ptr<const linphone::Address> &address) {
|
QString ToolModel::getDisplayName(const std::shared_ptr<const linphone::Address> &address) {
|
||||||
QString displayName;
|
QString displayName;
|
||||||
if (address) {
|
if (address) {
|
||||||
displayName = Utils::coreStringToAppString(address->getDisplayName());
|
auto linFriend = CoreModel::getInstance()->getCore()->findFriend(address);
|
||||||
|
if (linFriend) {
|
||||||
|
if (auto vcard = linFriend->getVcard()) displayName = Utils::coreStringToAppString(vcard->getFullName());
|
||||||
|
if (displayName.isEmpty()) displayName = Utils::coreStringToAppString(linFriend->getName());
|
||||||
|
}
|
||||||
if (displayName.isEmpty()) {
|
if (displayName.isEmpty()) {
|
||||||
displayName = Utils::coreStringToAppString(address->getUsername());
|
displayName = Utils::coreStringToAppString(address->getDisplayName());
|
||||||
displayName.replace('.', ' ');
|
if (displayName.isEmpty()) {
|
||||||
|
displayName = Utils::coreStringToAppString(address->getUsername());
|
||||||
|
displayName.replace('.', ' ');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// TODO
|
// TODO
|
||||||
// std::shared_ptr<linphone::Address> cleanAddress = address->clone();
|
// std::shared_ptr<linphone::Address> cleanAddress = address->clone();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue