diff --git a/app/build.gradle b/app/build.gradle index 9642b113..60e12506 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,6 +56,6 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.29.9' + implementation 'com.simplemobiletools:commons:5.29.10' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' } 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 472125ae..6d233358 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -44,7 +44,7 @@ class DialpadActivity : SimpleActivity() { } speedDialValues = config.getSpeedDialValues() - privateCursor = getMyContactsContentProviderCursorLoader().loadInBackground() + privateCursor = getMyContactsCursor().loadInBackground() dialpad_0_holder.setOnClickListener { dialpadPressed('0', it) } dialpad_1.setOnClickListener { dialpadPressed('1', it) } 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 d9731691..5a38f608 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt @@ -74,7 +74,7 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag } override fun refreshItems() { - val privateCursor = context?.getMyContactsContentProviderCursorLoader()?.loadInBackground() + val privateCursor = context?.getMyContactsCursor()?.loadInBackground() SimpleContactsHelper(context).getAvailableContacts(false) { contacts -> allContacts = 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 36ead432..f0c7a0d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt @@ -5,6 +5,7 @@ import android.util.AttributeSet import com.reddit.indicatorfastscroll.FastScrollItemIndicator import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.MyContactsContentProvider import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.models.SimpleContact @@ -47,8 +48,16 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa } override fun refreshItems() { + val privateCursor = context?.getMyFavoriteContactsCursor()?.loadInBackground() SimpleContactsHelper(context).getAvailableContacts(true) { contacts -> allContacts = contacts + + val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor) + if (privateContacts.isNotEmpty()) { + allContacts.addAll(privateContacts) + allContacts.sort() + } + activity?.runOnUiThread { gotContacts(contacts) } 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 c7a14c7b..04a4d335 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt @@ -43,7 +43,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage override fun primaryColorChanged(color: Int) {} override fun refreshItems() { - val privateCursor = context?.getMyContactsContentProviderCursorLoader()?.loadInBackground() + val privateCursor = context?.getMyContactsCursor()?.loadInBackground() RecentsHelper(context).getRecentCalls { recents -> SimpleContactsHelper(context).getAvailableContacts(false) { contacts -> val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt index 81d44624..5a6b1d49 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt @@ -6,7 +6,7 @@ import android.net.Uri import android.telecom.Call import android.telecom.InCallService import android.telecom.VideoProfile -import com.simplemobiletools.commons.extensions.getMyContactsContentProviderCursorLoader +import com.simplemobiletools.commons.extensions.getMyContactsCursor import com.simplemobiletools.commons.helpers.MyContactsContentProvider import com.simplemobiletools.commons.helpers.SimpleContactsHelper import com.simplemobiletools.commons.helpers.ensureBackgroundThread @@ -71,7 +71,7 @@ class CallManager { if (callContact.name != callContact.number) { callback(callContact) } else { - val privateCursor = context.getMyContactsContentProviderCursorLoader().loadInBackground() + val privateCursor = context.getMyContactsCursor().loadInBackground() ensureBackgroundThread { val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor) val privateContact = privateContacts.firstOrNull { it.phoneNumber == callContact.number } 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 3b9b3575..8bb9e0a2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt @@ -15,7 +15,7 @@ class RecentsHelper(private val context: Context) { @SuppressLint("MissingPermission") fun getRecentCalls(callback: (ArrayList) -> Unit) { - val privateCursor = context.getMyContactsContentProviderCursorLoader().loadInBackground() + val privateCursor = context.getMyContactsCursor().loadInBackground() ensureBackgroundThread { if (!context.hasPermission(PERMISSION_READ_CALL_LOG)) { callback(ArrayList())