commit 9d6657a21f74f61445d07a5a5362940c34f667ef
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Tue Apr 25 13:42:25 2017 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Wed Apr 26 18:22:18 2017 -0400
tree a433f4e2ba8d80f0dae1a8c44ce121fb8f2cda79
parent abf4e273eeb4a020c9be773133eeb8f4e973f349

UI: display bestID when formattedName is empty

This commit use bestID of last used contactMethod associated with
contact if formattedName is empty. It prevents SmartList and Contacts
from displaying placeholder text.

Change-Id: Ieb22697cb22c150af26d3de7caee49a9f92bc04a
Tuleap: #1585
Reviewed-by: Alexandre Lision <alexandre.lision@savoirfairelinux.com>

src/PersonsVC.mm

diff --git a/src/PersonsVC.mm b/src/PersonsVC.mm
index 07bc3f0..3b0d556 100644
--- a/src/PersonsVC.mm
+++ b/src/PersonsVC.mm
@@ -167,6 +167,7 @@
 
     NSTableCellView *result;
 
+    NSString* displayNameString = qIdx.data(Qt::DisplayRole).toString().toNSString();
     if(!qIdx.parent().isValid()) {
         result = [outlineView makeViewWithIdentifier:@"LetterCell" owner:outlineView];
         [result setWantsLayer:YES];
@@ -176,6 +177,18 @@
         NSImageView* photoView = [result viewWithTag:IMAGE_TAG];
         Person* p = qvariant_cast<Person*>(qIdx.data((int)Person::Role::Object));
 
+        if(displayNameString.length == 0 && p) {
+            QVector<ContactMethod*> contactMethods = p->phoneNumbers();
+            if(contactMethods.count() > 0) {
+                ContactMethod* method = contactMethods[0];
+                for(int i = 0; i < contactMethods.count(); i++) {
+                    if (contactMethods[i]->lastUsed() > method->lastUsed()) {
+                        method = contactMethods[i];
+                    }
+                }
+                displayNameString = method->getBestId().toNSString();
+            }
+        }
         [photoView setImage:QtMac::toNSImage(qvariant_cast<QPixmap>(qIdx.data(Qt::DecorationRole)))];
 
         [((ContextualTableCellView*) result) setContextualsControls:[NSMutableArray arrayWithObject:[result viewWithTag:CALL_BUTTON_TAG]]];
@@ -188,7 +201,7 @@
     }
 
     NSTextField* displayName = [result viewWithTag:DISPLAYNAME_TAG];
-    [displayName setStringValue:qIdx.data(Qt::DisplayRole).toString().toNSString()];
+    [displayName setStringValue:displayNameString];
 
     return result;
 }

src/SmartViewVC.mm

diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 97f5d81..f6e02e3 100644
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -261,7 +261,20 @@
     }
 
     NSTextField* displayName = [result viewWithTag:DISPLAYNAME_TAG];
-    [displayName setStringValue:qIdx.data((int)Ring::Role::Name).toString().toNSString()];
+    NSString* displayNameString = qIdx.data((int)Ring::Role::Name).toString().toNSString();
+    if(displayNameString.length == 0) {
+        QVector<ContactMethod*> contactMethods = RecentModel::instance().getContactMethods(qIdx);
+        if(contactMethods.count() > 0) {
+            ContactMethod* method = contactMethods[0];
+            for(int i = 0; i < contactMethods.count(); i++) {
+                if (contactMethods[i]->lastUsed() > method->lastUsed()) {
+                    method = contactMethods[i];
+                }
+            }
+            displayNameString = method->getBestId().toNSString();
+        }
+    }
+    [displayName setStringValue:displayNameString];
     NSImageView* photoView = [result viewWithTag:IMAGE_TAG];
 
     [photoView setImage:QtMac::toNSImage(qvariant_cast<QPixmap>(qIdx.data(Qt::DecorationRole)))];