From 45c7c37a258bb5148b0d3a1ff90cb9b9af7a575e Mon Sep 17 00:00:00 2001 From: ismailnurudeen Date: Wed, 29 Mar 2023 10:15:47 +0100 Subject: [PATCH] fix: private contacts filter --- .../dialer/fragments/ContactsFragment.kt | 11 ++++++----- .../dialer/fragments/FavoritesFragment.kt | 11 +++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) 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 0a6ac3cf..d62d302c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt @@ -65,12 +65,13 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag ContactsHelper(context).getContacts { contacts -> allContacts = contacts - val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) - if (privateContacts.isNotEmpty()) { - allContacts.addAll(privateContacts) - allContacts.sort() + if(SMT_PRIVATE !in context.baseConfig.ignoredContactSources) { + val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) + if (privateContacts.isNotEmpty()) { + allContacts.addAll(privateContacts) + allContacts.sort() + } } - (activity as MainActivity).cacheContacts(allContacts) activity?.runOnUiThread { 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 89e097f6..f9905b6d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt @@ -11,6 +11,7 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.ContactsHelper import com.simplemobiletools.commons.helpers.MyContactsContentProvider import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS +import com.simplemobiletools.commons.helpers.SMT_PRIVATE import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.contacts.Contact import com.simplemobiletools.dialer.R @@ -52,10 +53,12 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa ContactsHelper(context).getContacts { contacts -> allContacts = contacts - val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) - if (privateContacts.isNotEmpty()) { - allContacts.addAll(privateContacts) - allContacts.sort() + if(SMT_PRIVATE !in context.baseConfig.ignoredContactSources) { + val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor) + if (privateContacts.isNotEmpty()) { + allContacts.addAll(privateContacts) + allContacts.sort() + } } val favorites = contacts.filter { it.starred == 1 } as ArrayList