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 7e2621cc..1510132b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -291,10 +291,10 @@ class DialpadActivity : SimpleActivity() { val contact = it as Contact if (config.showCallConfirmation) { CallConfirmationDialog(this@DialpadActivity, contact.getNameToDisplay()) { - startCallIntent(contact.phoneNumbers.first().normalizedNumber) + startCallIntent(contact.getPrimaryNumber() ?: return@CallConfirmationDialog) } - }else{ - startCallIntent(contact.phoneNumbers.first().normalizedNumber) + } else { + startCallIntent(contact.getPrimaryNumber() ?: return@ContactsAdapter) } }.apply { dialpad_list.adapter = this 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 d9a6b254..c2ee834d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt @@ -224,9 +224,7 @@ class ContactsAdapter( private fun getSelectedItems() = contacts.filter { selectedKeys.contains(it.rawId) } as ArrayList private fun getSelectedPhoneNumber(): String? { - val numbers = getSelectedItems().firstOrNull()?.phoneNumbers - val primaryNumber = numbers?.firstOrNull { it.isPrimary } - return primaryNumber?.normalizedNumber ?: numbers?.firstOrNull()?.normalizedNumber + return getSelectedItems().firstOrNull()?.getPrimaryNumber() } private fun tryCreateShortcut() {