diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt index 69a8da8c..2bd424a6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -139,9 +139,8 @@ class DialpadActivity : SimpleActivity() { dialpad_input.requestFocus() dialpad_input.disableKeyboard() - ContactsHelper(this).getContacts { allContacts -> - val contactsWithNumber = allContacts.filter { it.phoneNumbers.isNotEmpty() }.toMutableList() as ArrayList - gotContacts(contactsWithNumber) + ContactsHelper(this).getContacts(showOnlyContactsWithNumbers = true) { allContacts -> + gotContacts(allContacts) } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt index 33e5a0d2..8d1f5961 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt @@ -28,7 +28,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener { speedDialValues = config.getSpeedDialValues() updateAdapter() - ContactsHelper(this).getContacts(false) { contacts -> + ContactsHelper(this).getContacts(showOnlyContactsWithNumbers = true) { contacts -> allContacts = contacts } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/FilterContactSourcesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/FilterContactSourcesDialog.kt index 2f729b1e..5ff44d7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/FilterContactSourcesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/FilterContactSourcesDialog.kt @@ -31,7 +31,7 @@ class FilterContactSourcesDialog(val activity: SimpleActivity, private val callb processDataIfReady() } - contactHelper.getContacts(getAll = true) { + contactHelper.getContacts(getAll = true, showOnlyContactsWithNumbers = true) { it.mapTo(contacts) { contact -> contact.copy() } val privateCursor = activity.getMyContactsCursor(false, true) val privateContacts = MyContactsContentProvider.getContacts(activity, privateCursor) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt index b0509c19..ffbd619a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt @@ -62,7 +62,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag override fun refreshItems(callback: (() -> Unit)?) { val privateCursor = context?.getMyContactsCursor(false, true) - ContactsHelper(context).getContacts { contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts -> allContacts = contacts if (SMT_PRIVATE !in context.baseConfig.ignoredContactSources) { @@ -159,7 +159,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag if (it) { fragment_placeholder.text = context.getString(R.string.no_contacts_found) fragment_placeholder_2.text = context.getString(R.string.create_new_contact) - ContactsHelper(context).getContacts(false) { contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts -> activity?.runOnUiThread { gotContacts(contacts) } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt index 0b136a8f..3e4904c3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt @@ -50,7 +50,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa override fun refreshItems(callback: (() -> Unit)?) { val privateCursor = context?.getMyContactsCursor(true, true) - ContactsHelper(context).getContacts { contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts -> allContacts = contacts if (SMT_PRIVATE !in context.baseConfig.ignoredContactSources) { diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt index 56b599ab..0a995e11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt @@ -50,7 +50,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage val privateCursor = context?.getMyContactsCursor(false, true) val groupSubsequentCalls = context?.config?.groupSubsequentCalls ?: false RecentsHelper(context).getRecentCalls(groupSubsequentCalls) { recents -> - ContactsHelper(context).getContacts { contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts -> val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) recents.filter { it.phoneNumber == it.name }.forEach { recent -> diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallContactHelper.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallContactHelper.kt index cd4a40da..6fe1ade5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallContactHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallContactHelper.kt @@ -35,7 +35,7 @@ fun getCallContact(context: Context, call: Call?, callback: (CallContact) -> Uni val uri = Uri.decode(handle) if (uri.startsWith("tel:")) { val number = uri.substringAfter("tel:") - ContactsHelper(context).getContacts{ contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true){ contacts -> val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) if (privateContacts.isNotEmpty()) { contacts.addAll(privateContacts) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt index 51c7252b..1dd7d8ed 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt @@ -24,7 +24,7 @@ class RecentsHelper(private val context: Context) { return@ensureBackgroundThread } - ContactsHelper(context).getContacts(false) { contacts -> + ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts -> val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) if (privateContacts.isNotEmpty()) { contacts.addAll(privateContacts)