From 7b849cb090a2614451069b145f1b771ea7625309 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 12 Dec 2017 20:19:15 +0100
Subject: [PATCH] handle both write and read contact permissions

---
 .../contacts/activities/ContactActivity.kt           | 12 ++++++++++--
 .../contacts/activities/MainActivity.kt              | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
index b3231328..b8ac0662 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
@@ -15,6 +15,7 @@ import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.Target
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
 import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS
 import com.simplemobiletools.contacts.R
 import com.simplemobiletools.contacts.extensions.config
@@ -35,9 +36,16 @@ class ContactActivity : SimpleActivity() {
         setContentView(R.layout.activity_contact)
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
 
-        handlePermission(PERMISSION_WRITE_CONTACTS) {
+        handlePermission(PERMISSION_READ_CONTACTS) {
             if (it) {
-                initContact()
+                handlePermission(PERMISSION_WRITE_CONTACTS) {
+                    if (it) {
+                        initContact()
+                    } else {
+                        toast(R.string.no_contacts_permission)
+                        finish()
+                    }
+                }
             } else {
                 toast(R.string.no_contacts_permission)
                 finish()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
index 4b6f36b4..55eab5c9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
 import com.simplemobiletools.commons.helpers.LICENSE_MULTISELECT
+import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
 import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.contacts.BuildConfig
@@ -36,9 +37,16 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
         appLaunched()
         contacts_fab.setOnClickListener { addNewContact() }
 
-        handlePermission(PERMISSION_WRITE_CONTACTS) {
+        handlePermission(PERMISSION_READ_CONTACTS) {
             if (it) {
-                initContacts()
+                handlePermission(PERMISSION_WRITE_CONTACTS) {
+                    if (it) {
+                        initContacts()
+                    } else {
+                        toast(R.string.no_contacts_permission)
+                        finish()
+                    }
+                }
             } else {
                 toast(R.string.no_contacts_permission)
                 finish()