From 8d9cec98864966537c5dff98144c0d3d9b21b7b9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 28 Jan 2019 20:25:12 +0000
Subject: [PATCH] Fixed wrong contact info showing

---
 .../main/java/eu/faircode/email/AdapterMessage.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 09afffd8b2..31a6887a53 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -154,6 +154,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     public class ViewHolder extends RecyclerView.ViewHolder implements
             View.OnClickListener, BottomNavigationView.OnNavigationItemSelectedListener {
+        private int position;
         private View itemView;
         private TextView tvDay;
         private View vwColor;
@@ -421,7 +422,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         @SuppressLint("WrongConstant")
-        private void bindTo(int position, final TupleMessageEx message) {
+        private void bindTo(int pos, final TupleMessageEx message) {
+            position = pos;
+
             final DB db = DB.getInstance(context);
             final boolean show_expanded = properties.getValue("expanded", message.id);
             boolean show_addresses = !properties.getValue("addresses", message.id);
@@ -496,11 +499,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 Bundle aargs = new Bundle();
                 aargs.putLong("id", message.id);
                 aargs.putSerializable("addresses", addresses);
+                aargs.putInt("position", position);
 
                 new SimpleTask<ContactInfo>() {
                     @Override
                     protected void onPreExecute(Bundle args) {
-                        itemView.setTag(message.id);
                         ivAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
                         tvFrom.setText(MessageHelper.formatAddresses(addresses, !compact, false));
                     }
@@ -513,8 +516,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected void onExecuted(Bundle args, ContactInfo info) {
-                        Long id = args.getLong("id");
-                        if (id != null && id.equals(itemView.getTag()))
+                        if (args.getInt("position") == position)
                             showContactInfo(info, message);
                     }