From 112dfa184a96f0a531520eda557f5cd5f5334d74 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 6 Dec 2015 15:29:57 +0100
Subject: [PATCH] Catch securtiy exception if contacts can't be read on Android
 6.0. Closes #182

---
 CHANGELOG.md                                              | 3 +++
 .../gadgetbridge/service/DeviceCommunicationService.java  | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78e9de9e..bfac0151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Next Version
+* Fix crash when contacts cannot be read on Android 6.0 (non-granted pemissions)
+
 ####Version 0.6.7
 * Pebble: Allow installation of 3.x apps on OG Pebble (FW will be released soon)
 * Fix crashes on startup when logging is enabled or when entering the app manager on some phones
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index e9539d68..ae9ff536 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -430,7 +430,13 @@ public class DeviceCommunicationService extends Service {
         }
 
         ContentResolver contentResolver = getContentResolver();
-        Cursor contactLookup = contentResolver.query(uri, null, null, null, null);
+
+        Cursor contactLookup = null;
+        try {
+            contentResolver.query(uri, null, null, null, null);
+        } catch (SecurityException e) {
+            return name;
+        }
 
         try {
             if (contactLookup != null && contactLookup.getCount() > 0) {