From 6e0fab2849f8066a0848128afe593aba1f3b55c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 1 Dec 2017 14:05:49 -0500
Subject: [PATCH] contactmodel: registeredName is not the alias
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I33b929f3b88e62c7231ce1aa07fd608f51f3876f
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>
---
src/contactmodel.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index 594e7464..faa5ce28 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -415,7 +415,7 @@ ContactModelPimpl::fillsWithRINGContacts() {
contact::Info contactInfo;
contactInfo.profileInfo = profileInfo;
- contactInfo.registeredName = cm->bestName().toStdString();
+ contactInfo.registeredName = cm->registeredName().toStdString();
contacts.emplace(contactUri.toStdString(), contactInfo);
database::getOrInsertProfile(db, contactUri.toStdString(),
@@ -474,7 +474,8 @@ ContactModelPimpl::addToContacts(ContactMethod* cm, const profile::Type& type)
to_string(linked.owner.profileInfo.type));
}
auto contactInfo = database::buildContactFromProfileId(db, contactId);
- contactInfo.registeredName = cm->bestName().toStdString();
+ contactInfo.registeredName = cm->registeredName().toStdString();
+
contactInfo.isPresent = cm->isPresent();
contactInfo.profileInfo.type = type; // Because PENDING should not be stored in the database
auto iter = contacts.find(contactInfo.profileInfo.uri);
--
GitLab