Merge lp:~renatofilho/telephony-service/fix-1585634 into lp:telephony-service

[Renato Araujo Oliveira Filho]

Contact name now checks for QContactDisplayLabel to display full name when possible.

[Gustavo Pichorim Boiko (boiko)]

looks good!

review: Approve

=== modified file 'libtelephonyservice/contactutils.cpp'
--- libtelephonyservice/contactutils.cpp	2015-11-18 12:33:16 +0000
+++ libtelephonyservice/contactutils.cpp	2016-06-01 15:34:09 +0000
@@ -21,6 +21,7 @@
 
 #include "contactutils.h"
 #include <QContactName>
+#include <QContactDisplayLabel>
 
 QTCONTACTS_USE_NAMESPACE
 
@@ -41,18 +42,25 @@
 // to use more than just first and last names.
 QString formatContactName(const QContact &contact)
 {
+    // try contact display label
+    QContactDisplayLabel displayLabel = contact.detail<QContactDisplayLabel>();
+    if (!displayLabel.isEmpty() && !displayLabel.label().isEmpty()) {
+        return displayLabel.label();
+    }
+
+    // if empty fallback to contact name
     QContactName name = contact.detail<QContactName>();
-
     QString formattedName = name.firstName();
 
-    // now check if we need an extra space to separate the first and last names
-    if (!formattedName.isEmpty() && !name.lastName().isEmpty()) {
-        formattedName.append(" ");
-    }
-
-    formattedName.append(name.lastName());
-
-    return formattedName;
+    if (!name.middleName().isEmpty()) {
+        formattedName += " " + name.middleName();
+    }
+
+    if (!name.lastName().isEmpty()) {
+        formattedName += " " + name.lastName();
+    }
+
+    return formattedName.trimmed();
 }
 
 }

=== modified file 'libtelephonyservice/greetercontacts.cpp'
--- libtelephonyservice/greetercontacts.cpp	2016-03-18 22:14:21 +0000
+++ libtelephonyservice/greetercontacts.cpp	2016-06-01 15:34:09 +0000
@@ -26,6 +26,7 @@
 #include <QContactInvalidFilter>
 #include <QContactManagerEngine>
 #include <QContactName>
+#include <QContactDisplayLabel>
 #include <QContactPhoneNumber>
 #include <QDBusInterface>
 #include <QDBusMetaType>
@@ -508,8 +509,12 @@
     QContactAvatar avatarDetail = contact.detail<QContactAvatar>();
     map.insert("Image", avatarDetail.imageUrl().toLocalFile());
 
+    QContactDisplayLabel displayLabel = contact.detail<QContactDisplayLabel>();
+    map.insert("DisplayLabel", displayLabel.label());
+
     QContactName nameDetail = contact.detail<QContactName>();
     map.insert("FirstName", nameDetail.firstName());
+    map.insert("MiddleName", nameDetail.middleName());
     map.insert("LastName", nameDetail.lastName());
 
     QContactPhoneNumber numberDetail = contact.detail<QContactPhoneNumber>();
@@ -528,8 +533,13 @@
 
     // We only use FirstName and LastName right now in ContactUtils::formatContactName().
     // If/When we use more, we should save more detail values here.
+    QContactDisplayLabel displayLabel;
+    displayLabel.setValue(QContactDisplayLabel::FieldLabel, map.value("DisplayLabel"));
+    contact.saveDetail(&displayLabel);
+
     QContactName nameDetail;
     nameDetail.setValue(QContactName::FieldFirstName, map.value("FirstName"));
+    nameDetail.setValue(QContactName::FieldMiddleName, map.value("MiddleName"));
     nameDetail.setValue(QContactName::FieldLastName, map.value("LastName"));
     contact.saveDetail(&nameDetail);
 

=== modified file 'tests/libtelephonyservice/GreeterContactsTest.cpp'
--- tests/libtelephonyservice/GreeterContactsTest.cpp	2015-08-14 18:27:11 +0000
+++ tests/libtelephonyservice/GreeterContactsTest.cpp	2016-06-01 15:34:09 +0000
@@ -22,6 +22,7 @@
 #include <QContact>
 #include <QContactAvatar>
 #include <QContactName>
+#include <QContactDisplayLabel>
 #include <QContactPhoneNumber>
 #include <QDBusInterface>
 #include <QDBusPendingCallWatcher>
@@ -218,9 +219,11 @@
 QVariantMap GreeterContactsTest::makeTestMap()
 {
     QVariantMap map;
+    map.insert("DisplayLabel", QVariant(""));
     map.insert("FirstName", QVariant("First"));
     map.insert("Image", QVariant(CMAKE_SOURCE_DIR "/icons/hicolor/48x48/apps/telephony-service-call.png"));
     map.insert("LastName", QVariant("Last"));
+    map.insert("MiddleName", QVariant("Middle"));
     map.insert("PhoneNumber", QVariant("555"));
     return map;
 }
@@ -240,9 +243,14 @@
     avatarDetail.setValue(QContactAvatar::FieldImageUrl, QUrl::fromLocalFile(imagePath));
     contact.saveDetail(&avatarDetail);
 
+    QContactDisplayLabel label;
+    label.setLabel("");
+    contact.saveDetail(&label);
+
     QContactName nameDetail;
     nameDetail.setValue(QContactName::FieldFirstName, "First");
     nameDetail.setValue(QContactName::FieldLastName, "Last");
+    nameDetail.setValue(QContactName::FieldMiddleName, "Middle");
     contact.saveDetail(&nameDetail);
 
     QContactPhoneNumber numberDetail;