From ee03489a31c1ffdd7404d64dc6412c5f17cc6abd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Aug 2018 09:27:01 +0000
Subject: [PATCH] List identity email address instead of user name

The email address will be more recognizable than the user name, which could be anything
---
 app/src/main/java/eu/faircode/email/AdapterIdentity.java | 6 +++---
 app/src/main/res/layout/item_identity.xml                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 12c4f249..6f645a41 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -52,7 +52,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
         TextView tvName;
         ImageView ivSync;
         TextView tvHost;
-        TextView tvUser;
+        TextView tvEmail;
 
         ViewHolder(View itemView) {
             super(itemView);
@@ -62,7 +62,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             tvName = itemView.findViewById(R.id.tvName);
             ivSync = itemView.findViewById(R.id.ivSync);
             tvHost = itemView.findViewById(R.id.tvHost);
-            tvUser = itemView.findViewById(R.id.tvUser);
+            tvEmail = itemView.findViewById(R.id.tvEmail);
         }
 
         private void wire() {
@@ -197,7 +197,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
         holder.tvName.setText(identity.name);
         holder.ivSync.setVisibility(identity.synchronize ? View.VISIBLE : View.INVISIBLE);
         holder.tvHost.setText(String.format("%s:%d", identity.host, identity.port));
-        holder.tvUser.setText(identity.user);
+        holder.tvEmail.setText(identity.email);
 
         holder.wire();
     }
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index 05d5fe0f..05853514 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -49,7 +49,7 @@
         app:layout_constraintTop_toBottomOf="@id/ivSync" />
 
     <TextView
-        android:id="@+id/tvUser"
+        android:id="@+id/tvEmail"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
@@ -68,5 +68,5 @@
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvUser" />
+        app:layout_constraintTop_toBottomOf="@id/tvHost" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file