From 94421c1e9a70f3b779438fd271446f8ad0deb2d5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 18 Oct 2018 18:45:27 +0000
Subject: [PATCH] Address book requires contacts permissions

---
 .../main/java/eu/faircode/email/AdapterMessage.java    | 10 ++++++----
 app/src/main/res/layout/item_message.xml               |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e106e18a..f8819f72 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -104,6 +104,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
     private ViewType viewType;
     private IProperties properties;
 
+    private boolean contacts;
     private boolean avatars;
     private boolean debug;
 
@@ -349,6 +350,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             tvTime.setTextColor(colorUnseen);
 
             grpExpanded.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.VISIBLE : View.GONE);
+            ivAddContact.setVisibility(viewType == ViewType.THREAD && show_expanded && contacts ? View.VISIBLE : View.GONE);
             pbHeaders.setVisibility(View.GONE);
             grpHeaders.setVisibility(show_headers && show_expanded ? View.VISIBLE : View.GONE);
             bnvActions.setVisibility(View.GONE);
@@ -373,7 +375,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                     tvTimeEx.setText(df.format(new Date(message.received)));
                 }
 
-                ivAddContact.setVisibility(viewType == ViewType.THREAD ? View.VISIBLE : View.GONE);
                 tvTo.setText(MessageHelper.getFormattedAddresses(message.to, true));
                 tvReplyTo.setText(MessageHelper.getFormattedAddresses(message.reply, true));
                 tvCc.setText(MessageHelper.getFormattedAddresses(message.cc, true));
@@ -1328,9 +1329,10 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
-        this.avatars = (prefs.getBoolean("avatars", true) &&
-                ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
-                        == PackageManager.PERMISSION_GRANTED);
+
+        this.contacts = (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
+                == PackageManager.PERMISSION_GRANTED);
+        this.avatars = (prefs.getBoolean("avatars", true) && this.contacts);
         this.debug = prefs.getBoolean("debug", false);
     }
 
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 1d3657d6..42f1de58 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -494,6 +494,6 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:visibility="visible"
-            app:constraint_referenced_ids="ivAddContact,vSeparatorAddress,tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeEx,tvSubjectEx,tvBody" />
+            app:constraint_referenced_ids="vSeparatorAddress,tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeEx,tvSubjectEx,tvBody" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file