From 70417266c120c2789d345a71d8db2614fbda1dd7 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 20 Sep 2018 11:16:03 +0000 Subject: [PATCH] Fixed empty photo in message view --- .../java/eu/faircode/email/FragmentMessage.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index 15a657a949..99482549c2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java @@ -489,17 +489,22 @@ public class FragmentMessage extends FragmentEx { setSeen(); - if (message.avatar == null || + boolean photo = false; + if (message.avatar != null && ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_CONTACTS) - != PackageManager.PERMISSION_GRANTED) { + == PackageManager.PERMISSION_GRANTED) { + ContentResolver resolver = getContext().getContentResolver(); + InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, Uri.parse(message.avatar)); + if (is != null) { + photo = true; + ivAvatar.setImageDrawable(Drawable.createFromStream(is, "avatar")); + } + } + if (!photo) { ViewGroup.LayoutParams lp = ivAvatar.getLayoutParams(); lp.height = 0; lp.width = 0; ivAvatar.setLayoutParams(lp); - } else { - ContentResolver resolver = getContext().getContentResolver(); - InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, Uri.parse(message.avatar)); - ivAvatar.setImageDrawable(Drawable.createFromStream(is, "avatar")); } if (message.from == null ||