fix #4655: Show Displayname when selecting contact

Shows the "DisplayName" if it is present and not the same as the foundName in the contact selection dialog.
cgeo · Nov 27, 2015 · 700fa80 · 700fa80
1 parent 5847a8d
commit 700fa80
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
@@ -111,7 +111,7 @@ private void openContactAndFinish(final int id) {
 
     @NonNull
     private List<Pair<Integer, String>> getContacts(final @NonNull String searchName, final Uri uri, final @NonNull String idColumnName, final @NonNull String selectionColumnName, final boolean like) {
-        final String[] projection = new String[] { idColumnName, selectionColumnName };
+        final String[] projection = new String[] { idColumnName, selectionColumnName, ContactsContract.Contacts.DISPLAY_NAME };
         final String selection = selectionColumnName + (like ? " LIKE" : " =") + " ? COLLATE NOCASE";
         final String[] selectionArgs = new String[] { like ? "%" + searchName + "%" : searchName };
         Cursor cursor = null;
@@ -122,7 +122,9 @@ private List<Pair<Integer, String>> getContacts(final @NonNull String searchName
             while (cursor != null && cursor.moveToNext()) {
                 final int foundId = cursor.getInt(0);
                 final String foundName = cursor.getString(1);
-                result.add(new Pair<>(foundId, foundName));
+                final String displayName = cursor.getString(2);
+                result.add(new Pair<>(foundId, StringUtils.isNotEmpty(displayName) &&
+                        !StringUtils.equalsIgnoreCase(foundName, displayName) ? foundName + " (" + displayName + ")" : foundName));
             }
         } catch (final Exception e) {
             Log.e(LOG_TAG, "ContactsActivity.getContactId", e);