From 04ce30cdbd3ba60ec70a692965a4b55f4e1d2043 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 25 Sep 2018 14:42:08 +0200
Subject: [PATCH] improve the contact number fetching at the dialpad

---
 .../simplemobiletools/contacts/adapters/ContactsAdapter.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index bb310fb4..867a8771 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -262,12 +262,13 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
             contact_name.setPadding(if (showContactThumbnails) smallPadding else bigPadding, smallPadding, smallPadding, 0)
 
             if (contact_number != null) {
-                val numberText = if (textToHighlight.isEmpty()) {
-                    contact.phoneNumbers.firstOrNull()?.value ?: ""
+                val phoneNumberToUse = if (textToHighlight.isEmpty()) {
+                    contact.phoneNumbers.firstOrNull()
                 } else {
-                    contact.phoneNumbers.firstOrNull { it.value.contains(textToHighlight) }?.value ?: ""
+                    contact.phoneNumbers.firstOrNull { it.value.contains(textToHighlight) } ?: contact.phoneNumbers.firstOrNull()
                 }
 
+                val numberText = phoneNumberToUse?.value ?: ""
                 contact_number.text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, adjustedPrimaryColor)
                 contact_number.setTextColor(textColor)
                 contact_number.setPadding(if (showContactThumbnails) smallPadding else bigPadding, 0, smallPadding, 0)