From 284a5fb35f00444307c08bf702dee211887d074d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 24 Sep 2018 15:17:15 +0200
Subject: [PATCH] try calling contact directly from the dialpad screen, do not
 trigger edit/view

---
 .../contacts/activities/DialpadActivity.kt       |  4 ++--
 .../contacts/extensions/Activity.kt              | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt
index d20d8aa5..4d19b26a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt
@@ -11,8 +11,8 @@ import com.simplemobiletools.commons.helpers.isLollipopPlus
 import com.simplemobiletools.contacts.R
 import com.simplemobiletools.contacts.adapters.ContactsAdapter
 import com.simplemobiletools.contacts.extensions.afterTextChanged
+import com.simplemobiletools.contacts.extensions.callContact
 import com.simplemobiletools.contacts.extensions.config
-import com.simplemobiletools.contacts.extensions.contactClicked
 import com.simplemobiletools.contacts.helpers.ContactsHelper
 import com.simplemobiletools.contacts.helpers.LOCATION_DIALPAD
 import com.simplemobiletools.contacts.helpers.PHONE_NUMBER_PATTERN
@@ -103,7 +103,7 @@ class DialpadActivity : SimpleActivity() {
         } as ArrayList<Contact>
 
         ContactsAdapter(this, filtered, null, LOCATION_DIALPAD, null, dialpad_list, dialpad_fastscroller) {
-            contactClicked(it as Contact)
+            callContact(it as Contact)
         }.apply {
             addVerticalDividers(true)
             dialpad_list.adapter = this
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
index 41397cfc..b2adcb75 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
@@ -203,14 +203,16 @@ fun Activity.getVisibleContactSources(): ArrayList<String> {
 
 fun SimpleActivity.contactClicked(contact: Contact) {
     when (config.onContactClick) {
-        ON_CLICK_CALL_CONTACT -> {
-            if (contact.phoneNumbers.isNotEmpty()) {
-                tryStartCall(contact)
-            } else {
-                toast(R.string.no_phone_number_found)
-            }
-        }
+        ON_CLICK_CALL_CONTACT -> callContact(contact)
         ON_CLICK_VIEW_CONTACT -> viewContact(contact)
         ON_CLICK_EDIT_CONTACT -> editContact(contact)
     }
 }
+
+fun SimpleActivity.callContact(contact: Contact) {
+    if (contact.phoneNumbers.isNotEmpty()) {
+        tryStartCall(contact)
+    } else {
+        toast(R.string.no_phone_number_found)
+    }
+}