From bcd22c50d305b6ea134ec9fd4578747db08dc0ac Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 29 Apr 2017 00:14:21 +0200 Subject: [PATCH] Read contacts event if there are no phone numbers present, improve permission check for SDK<23. --- .../src/main/java/com/b44t/messenger/ContactsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java b/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java index 8c023901d..0957fe4ca 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java @@ -101,10 +101,11 @@ public class ContactsController { if (Build.VERSION.SDK_INT >= 23) { return ApplicationLoader.applicationContext.checkSelfPermission(android.Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED; } + /* -- no need for a fallback chack as the caller uses a try/catch anyway - and if this fails, there's nothing we can do Cursor cursor = null; try { ContentResolver cr = ApplicationLoader.applicationContext.getContentResolver(); - cursor = cr.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, projectionNames, null, null, null); + cursor = cr.query(ContactsContract.CommonDataKinds.Email.CONTENT_URI, projectionNames, null, null, null); if (cursor == null || cursor.getCount() == 0) { return false; } @@ -119,6 +120,7 @@ public class ContactsController { ; } } + */ return true; }