fix: always dial primary number by default

This commit is contained in:
ismailnurudeen
2023-04-18 18:06:34 +01:00
parent 87afcc86b1
commit e2455d8cf0
2 changed files with 4 additions and 6 deletions

View File

@@ -291,10 +291,10 @@ class DialpadActivity : SimpleActivity() {
val contact = it as Contact val contact = it as Contact
if (config.showCallConfirmation) { if (config.showCallConfirmation) {
CallConfirmationDialog(this@DialpadActivity, contact.getNameToDisplay()) { CallConfirmationDialog(this@DialpadActivity, contact.getNameToDisplay()) {
startCallIntent(contact.phoneNumbers.first().normalizedNumber) startCallIntent(contact.getPrimaryNumber() ?: return@CallConfirmationDialog)
} }
} else { } else {
startCallIntent(contact.phoneNumbers.first().normalizedNumber) startCallIntent(contact.getPrimaryNumber() ?: return@ContactsAdapter)
} }
}.apply { }.apply {
dialpad_list.adapter = this dialpad_list.adapter = this

View File

@@ -224,9 +224,7 @@ class ContactsAdapter(
private fun getSelectedItems() = contacts.filter { selectedKeys.contains(it.rawId) } as ArrayList<Contact> private fun getSelectedItems() = contacts.filter { selectedKeys.contains(it.rawId) } as ArrayList<Contact>
private fun getSelectedPhoneNumber(): String? { private fun getSelectedPhoneNumber(): String? {
val numbers = getSelectedItems().firstOrNull()?.phoneNumbers return getSelectedItems().firstOrNull()?.getPrimaryNumber()
val primaryNumber = numbers?.firstOrNull { it.isPrimary }
return primaryNumber?.normalizedNumber ?: numbers?.firstOrNull()?.normalizedNumber
} }
private fun tryCreateShortcut() { private fun tryCreateShortcut() {