From 108e72fd10bac25c33f9581b0fc39db298a2df5e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 31 Dec 2017 09:50:48 +0100
Subject: [PATCH] apply search to phone numbers too

---
 .../simplemobiletools/contacts/activities/MainActivity.kt | 1 +
 .../contacts/fragments/MyViewPagerFragment.kt             | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 9d11a659..57555f15 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -174,6 +174,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             }
 
             override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                getCurrentFragment().onSearchClosed()
                 isSearchOpen = false
                 return true
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
index 0d1b8f7e..296c4a4e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt
@@ -158,7 +158,9 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
 
     fun onSearchQueryChanged(text: String) {
         (fragment_list.adapter as ContactsAdapter).apply {
-            val filtered = contactsIgnoringSearch.filter { it.getFullName(startNameWithSurname).contains(text, true) } as ArrayList
+            val filtered = contactsIgnoringSearch.filter {
+                it.getFullName(startNameWithSurname).contains(text, true) || it.phoneNumbers.any { it.value.contains(text, true) }
+            } as ArrayList
             updateItems(filtered)
         }
     }
@@ -167,6 +169,10 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
         contactsIgnoringSearch = (fragment_list.adapter as ContactsAdapter).contactItems as ArrayList
     }
 
+    fun onSearchClosed() {
+        (fragment_list.adapter as ContactsAdapter).updateItems(contactsIgnoringSearch)
+    }
+
     private fun updateViewStuff() {
         context.updateTextColors(fragment_wrapper)
         fragment_fastscroller.updateBubbleColors()