From dd6771fd0cfd063b47a3a6ee47fee6481b1a969a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 10 Feb 2018 23:42:11 +0100
Subject: [PATCH] move contact init at ViewContactActivity to resume

---
 .../contacts/activities/ContactActivity.kt    |  1 -
 .../activities/ViewContactActivity.kt         | 24 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 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 12db14bf..01f9ff0e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
@@ -32,7 +32,6 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 abstract class ContactActivity : SimpleActivity() {
-    var isEditActivity = false
     var contact: Contact? = null
     var currentContactPhotoPath = ""
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
index 5119db88..c86ee0c6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
@@ -24,16 +24,11 @@ class ViewContactActivity : ContactActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_view_contact)
-        isEditActivity = false
+    }
 
-        handlePermission(PERMISSION_READ_CONTACTS) {
-            if (it) {
-                initContact()
-            } else {
-                toast(R.string.no_contacts_permission)
-                finish()
-            }
-        }
+    override fun onResume() {
+        super.onResume()
+        tryInitContact()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -51,6 +46,17 @@ class ViewContactActivity : ContactActivity() {
         return true
     }
 
+    private fun tryInitContact() {
+        handlePermission(PERMISSION_READ_CONTACTS) {
+            if (it) {
+                initContact()
+            } else {
+                toast(R.string.no_contacts_permission)
+                finish()
+            }
+        }
+    }
+
     private fun initContact() {
         var contactId = intent.getIntExtra(CONTACT_ID, 0)
         val action = intent.action