From eb914ddfdf6ec4ddb2ce90de4ca192c53d54a22a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 26 Sep 2018 10:11:13 +0200
Subject: [PATCH] create a new activity for handling ACTION_INSERT_OR_EDIT
 intent

---
 app/src/main/AndroidManifest.xml              | 24 ++++++++++++-------
 .../activities/EditContactActivity.kt         |  4 ++--
 .../activities/InsertOrEditContactActivity.kt | 17 +++++++++++++
 .../layout/activity_insert_edit_contact.xml   |  8 +++++++
 4 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt
 create mode 100644 app/src/main/res/layout/activity_insert_edit_contact.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2f5328a..25d5f869 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,15 +118,6 @@
             android:name=".activities.EditContactActivity"
             android:parentActivityName=".activities.MainActivity">
 
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-
-                <data android:mimeType="vnd.android.cursor.item/person"/>
-                <data android:mimeType="vnd.android.cursor.item/contact"/>
-                <data android:mimeType="vnd.android.cursor.item/raw_contact"/>
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.EDIT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -163,6 +154,21 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.InsertOrEditContactActivity"
+            android:label="@string/select_contact"
+            android:parentActivityName=".activities.MainActivity">
+
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT_OR_EDIT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data android:mimeType="vnd.android.cursor.item/person"/>
+                <data android:mimeType="vnd.android.cursor.item/contact"/>
+                <data android:mimeType="vnd.android.cursor.item/raw_contact"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name="com.simplemobiletools.commons.activities.AboutActivity"
             android:label="@string/about"
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
index dcd70766..26b9e96a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
@@ -58,7 +58,7 @@ class EditContactActivity : ContactActivity() {
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
 
         val action = intent.action
-        isThirdPartyIntent = action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT_OR_EDIT || action == Intent.ACTION_INSERT
+        isThirdPartyIntent = action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT
         val isFromSimpleContacts = intent.getBooleanExtra(IS_FROM_SIMPLE_CONTACTS, false)
         if (isThirdPartyIntent && !isFromSimpleContacts) {
             handlePermission(PERMISSION_READ_CONTACTS) {
@@ -149,7 +149,7 @@ class EditContactActivity : ContactActivity() {
             setupEditContact()
         }
 
-        if (contact!!.id == 0 && intent.extras?.containsKey(KEY_PHONE) == true && (action == Intent.ACTION_INSERT_OR_EDIT || action == Intent.ACTION_INSERT)) {
+        if (contact!!.id == 0 && intent.extras?.containsKey(KEY_PHONE) == true && action == Intent.ACTION_INSERT) {
             val phoneNumber = intent.extras.get(KEY_PHONE)?.toString() ?: ""
             contact!!.phoneNumbers.add(PhoneNumber(phoneNumber, DEFAULT_PHONE_NUMBER_TYPE, ""))
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt
new file mode 100644
index 00000000..407089ff
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/InsertOrEditContactActivity.kt
@@ -0,0 +1,17 @@
+package com.simplemobiletools.contacts.activities
+
+import android.os.Bundle
+import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
+import com.simplemobiletools.contacts.R
+
+class InsertOrEditContactActivity : ContactActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_insert_edit_contact)
+
+        handlePermission(PERMISSION_READ_CONTACTS) {
+            // we do not really care about the permission request result. Even if it was denied, load private contacts
+
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_insert_edit_contact.xml b/app/src/main/res/layout/activity_insert_edit_contact.xml
new file mode 100644
index 00000000..1c58b814
--- /dev/null
+++ b/app/src/main/res/layout/activity_insert_edit_contact.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/insert_edit_contact_holder"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+</RelativeLayout>