fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-06-05 21:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly show favorite private contacts from Simple Contacts Pro

Browse Source
This commit is contained in:
tibbi
2020-06-19 11:32:48 +02:00
parent 2d59b72f25
commit 5cf3e25ef9
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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'
}

2
app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
View File

@ -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) }

2
app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
View File

@ -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

9
app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
View File

@ -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)
}

2
app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
View File

@ -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)

4
app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt
View File

@ -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 }

2
app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
View File

@ -15,7 +15,7 @@ class RecentsHelper(private val context: Context) {
@SuppressLint("MissingPermission")
fun getRecentCalls(callback: (ArrayList<RecentCall>) -> Unit) {
val privateCursor = context.getMyContactsContentProviderCursorLoader().loadInBackground()
val privateCursor = context.getMyContactsCursor().loadInBackground()
ensureBackgroundThread {
if (!context.hasPermission(PERMISSION_READ_CALL_LOG)) {
callback(ArrayList())