From cdd9efe4e9ee4201dbeb88c9572bfee68a956ece Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 12 Jul 2020 15:50:57 +0200 Subject: [PATCH] updating commons, handle SimpleContact having multiple numbers --- app/build.gradle | 2 +- .../simplemobiletools/dialer/activities/DialpadActivity.kt | 2 +- .../dialer/activities/ManageSpeedDialActivity.kt | 2 +- .../com/simplemobiletools/dialer/adapters/ContactsAdapter.kt | 2 +- .../simplemobiletools/dialer/fragments/FavoritesFragment.kt | 2 +- .../com/simplemobiletools/dialer/fragments/RecentsFragment.kt | 4 ++-- .../com/simplemobiletools/dialer/helpers/CallManager.kt | 2 +- .../com/simplemobiletools/dialer/helpers/RecentsHelper.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 21388602..b0dc3380 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,6 +56,6 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.29.13' + implementation 'com.simplemobiletools:commons:5.29.16' 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 6d233358..d2b887b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -201,7 +201,7 @@ class DialpadActivity : SimpleActivity() { }) ContactsAdapter(this, filtered, dialpad_list, null, text) { - startCallIntent((it as SimpleContact).phoneNumber) + startCallIntent((it as SimpleContact).phoneNumbers.first()) }.apply { dialpad_list.adapter = this } 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 b26cc194..c955cf3f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt @@ -45,7 +45,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener { SelectContactDialog(this, allContacts) { selectedContact -> speedDialValues.first { it.id == clickedContact.id }.apply { displayName = selectedContact.name - number = selectedContact.phoneNumber + number = selectedContact.phoneNumbers.first() } updateAdapter() } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt index 9b91c180..bad67051 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt @@ -147,7 +147,7 @@ class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList val action = if (hasPermission) Intent.ACTION_CALL else Intent.ACTION_DIAL val intent = Intent(action).apply { - data = Uri.fromParts("tel", contact.phoneNumber, null) + data = Uri.fromParts("tel", contact.phoneNumbers.first(), null) } val shortcut = ShortcutInfo.Builder(activity, contact.hashCode().toString()) 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 f0c7a0d9..44b4a840 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt @@ -76,7 +76,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa val currAdapter = fragment_list.adapter if (currAdapter == null) { ContactsAdapter(activity as SimpleActivity, contacts, fragment_list, this, showDeleteButton = false) { - activity?.launchCallIntent((it as SimpleContact).phoneNumber) + activity?.launchCallIntent((it as SimpleContact).phoneNumbers.first()) }.apply { fragment_list.adapter = this } 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 04a4d335..e97b2e04 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 recents.filter { it.phoneNumber == it.name }.forEach { recent -> var wasNameFilled = false if (privateContacts.isNotEmpty()) { - val privateContact = privateContacts.firstOrNull { it.phoneNumber == recent.phoneNumber } + val privateContact = privateContacts.firstOrNull { it.phoneNumbers.first() == recent.phoneNumber } if (privateContact != null) { recent.name = privateContact.name wasNameFilled = true @@ -58,7 +58,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage } if (!wasNameFilled) { - val contact = contacts.firstOrNull { it.phoneNumber == recent.phoneNumber } + val contact = contacts.firstOrNull { it.phoneNumbers.first() == recent.phoneNumber } if (contact != null) { recent.name = contact.name } 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 5a6b1d49..98da5d04 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt @@ -74,7 +74,7 @@ class CallManager { val privateCursor = context.getMyContactsCursor().loadInBackground() ensureBackgroundThread { val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor) - val privateContact = privateContacts.firstOrNull { it.phoneNumber == callContact.number } + val privateContact = privateContacts.firstOrNull { it.phoneNumbers.first() == callContact.number } if (privateContact != null) { callContact.name = privateContact.name } 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 8bb9e0a2..4ee66c82 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt @@ -71,7 +71,7 @@ class RecentsHelper(private val context: Context) { val normalizedNumber = number.normalizePhoneNumber() if (normalizedNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) { name = contacts.firstOrNull { contact -> - val curNumber = contact.phoneNumber.normalizePhoneNumber() + val curNumber = contact.phoneNumbers.first().normalizePhoneNumber() if (curNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) { if (curNumber.substring(curNumber.length - COMPARABLE_PHONE_NUMBER_LENGTH) == normalizedNumber.substring(normalizedNumber.length - COMPARABLE_PHONE_NUMBER_LENGTH)) { contactsNumbersMap[number] = contact.name