From 4ad1bde2e3c8396b6f5b8ae67c99aaecdbf40ff5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 7 Nov 2018 19:16:31 +0000
Subject: [PATCH] Prevent crash

---
 .../java/eu/faircode/email/AdapterMessage.java  | 17 ++++++++++-------
 .../eu/faircode/email/ServiceSynchronize.java   |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b57f5cc411..0b3ec85a1b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -296,14 +296,17 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
             boolean photo = false;
             if (avatars) {
-                if (message.avatar != null) {
-                    ContentResolver resolver = context.getContentResolver();
-                    InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, Uri.parse(message.avatar));
-                    if (is != null) {
-                        photo = true;
-                        ivAvatar.setImageDrawable(Drawable.createFromStream(is, "avatar"));
+                if (message.avatar != null)
+                    try {
+                        ContentResolver resolver = context.getContentResolver();
+                        InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, Uri.parse(message.avatar));
+                        if (is != null) {
+                            photo = true;
+                            ivAvatar.setImageDrawable(Drawable.createFromStream(is, "avatar"));
+                        }
+                    } catch (SecurityException ex) {
+                        Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                     }
-                }
             }
             if (!photo && identicons) {
                 if (message.from != null && message.from.length > 0)
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 47909ad495..3dcddbc185 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -525,6 +525,8 @@ public class ServiceSynchronize extends LifecycleService {
                                     cursor.getLong(0) + "/photo");
                             mbuilder.setLargeIcon(Icon.createWithContentUri(photo));
                         }
+                    } catch (SecurityException ex) {
+                        Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                     } finally {
                         if (cursor != null)
                             cursor.close();