From 1575ef6f3836fbe037e85b1b8e38fc500e05f5a5 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 7 Jan 2024 17:40:23 +0100 Subject: [PATCH 1/2] Fixed letter to number conversion in search (#14) --- .../org/fossify/contacts/fragments/MyViewPagerFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt index e26f6bbd..69740632 100644 --- a/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt @@ -313,9 +313,9 @@ abstract class MyViewPagerFragment(c val filtered = contactsIgnoringSearch.filter { getProperText(it.getNameToDisplay(), shouldNormalize).contains(fixedText, true) || getProperText(it.nickname, shouldNormalize).contains(fixedText, true) || - it.phoneNumbers.any { + (fixedText.toDoubleOrNull() != null && it.phoneNumbers.any { fixedText.normalizePhoneNumber().isNotEmpty() && it.normalizedNumber.contains(fixedText.normalizePhoneNumber(), true) - } || + }) || it.emails.any { it.value.contains(fixedText, true) } || it.addresses.any { getProperText(it.value, shouldNormalize).contains(fixedText, true) } || it.IMs.any { it.value.contains(fixedText, true) } || From 13c1b51e737e3f52d8bf58d198d1836e30ea93bf Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Wed, 10 Jan 2024 22:42:20 +0100 Subject: [PATCH 2/2] Changed double to int --- .../org/fossify/contacts/fragments/MyViewPagerFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt index 69740632..c5a0267b 100644 --- a/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt @@ -313,7 +313,7 @@ abstract class MyViewPagerFragment(c val filtered = contactsIgnoringSearch.filter { getProperText(it.getNameToDisplay(), shouldNormalize).contains(fixedText, true) || getProperText(it.nickname, shouldNormalize).contains(fixedText, true) || - (fixedText.toDoubleOrNull() != null && it.phoneNumbers.any { + (fixedText.toIntOrNull() != null && it.phoneNumbers.any { fixedText.normalizePhoneNumber().isNotEmpty() && it.normalizedNumber.contains(fixedText.normalizePhoneNumber(), true) }) || it.emails.any { it.value.contains(fixedText, true) } ||