From c1785c5b138158b418bdb60b3633ffd2d64a8685 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 31 Oct 2018 12:21:08 -0300
Subject: [PATCH] [android] Show contact alias in contact lists
---
.../briar/android/contact/BaseContactListAdapter.java | 8 +++++---
.../briar/android/contact/ContactItemViewHolder.java | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
index 1f577c3669..5e58597ce9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/BaseContactListAdapter.java
@@ -1,6 +1,7 @@
package org.briarproject.briar.android.contact;
import android.content.Context;
+import android.support.annotation.NonNull;
import android.view.View;
import org.briarproject.bramble.api.contact.ContactId;
@@ -9,6 +10,7 @@ import org.briarproject.briar.android.util.BriarAdapter;
import javax.annotation.Nullable;
import static android.support.v7.util.SortedList.INVALID_POSITION;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
public abstract class BaseContactListAdapter<I extends ContactItem, VH extends ContactItemViewHolder<I>>
extends BriarAdapter<I, VH> {
@@ -23,15 +25,15 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
}
@Override
- public void onBindViewHolder(VH ui, int position) {
+ public void onBindViewHolder(@NonNull VH ui, int position) {
I item = items.get(position);
ui.bind(item, listener);
}
@Override
public int compare(I c1, I c2) {
- return c1.getContact().getAuthor().getName()
- .compareTo(c2.getContact().getAuthor().getName());
+ return getContactDisplayName(c1.getContact())
+ .compareTo(getContactDisplayName(c2.getContact()));
}
@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java
index 6bc4f3d493..403994d595 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java
@@ -16,6 +16,8 @@ import javax.annotation.Nullable;
import im.delight.android.identicons.IdenticonDrawable;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+
@UiThread
@NotNullByDefault
public class ContactItemViewHolder<I extends ContactItem>
@@ -41,8 +43,7 @@ public class ContactItemViewHolder<I extends ContactItem>
Author author = item.getContact().getAuthor();
avatar.setImageDrawable(
new IdenticonDrawable(author.getId().getBytes()));
- String contactName = author.getName();
- name.setText(contactName);
+ name.setText(getContactDisplayName(item.getContact()));
if (bulb != null) {
// online/offline
--
GitLab