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 handle default numbers at SMS too

Browse Source
This commit is contained in:
tibbi
2022-06-24 22:56:52 +02:00
parent fe43b4bc05
commit d3944a84ab
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
View File

@ -148,7 +148,7 @@ class ContactsAdapter(
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
private fun callContact(useSimOne: Boolean) { private fun callContact(useSimOne: Boolean) {
val number = getSelectedPhoneNumber() ?: return val number = getSelectedPhoneNumber() ?: return
activity.callContactWithSim(number.normalizedNumber, useSimOne) activity.callContactWithSim(number, useSimOne)
} }
private fun removeDefaultSIM() { private fun removeDefaultSIM() {
@ -158,7 +158,17 @@ class ContactsAdapter(
} }
private fun sendSMS() { private fun sendSMS() {
val numbers = getSelectedItems().map { it.phoneNumbers.first() } val numbers = ArrayList<String>()
getSelectedItems().map { simpleContact ->
val contactNumbers = simpleContact.phoneNumbers
val primaryNumber = contactNumbers.firstOrNull { it.isPrimary }
val normalizedNumber = primaryNumber?.normalizedNumber ?: contactNumbers.firstOrNull()?.normalizedNumber
if (normalizedNumber != null) {
numbers.add(normalizedNumber)
}
}
val recipient = TextUtils.join(";", numbers) val recipient = TextUtils.join(";", numbers)
activity.launchSendSMSIntent(recipient) activity.launchSendSMSIntent(recipient)
} }
@ -211,7 +221,11 @@ class ContactsAdapter(
private fun getSelectedItems() = contacts.filter { selectedKeys.contains(it.rawId) } as ArrayList<SimpleContact> private fun getSelectedItems() = contacts.filter { selectedKeys.contains(it.rawId) } as ArrayList<SimpleContact>
private fun getSelectedPhoneNumber() = getSelectedItems().firstOrNull()?.phoneNumbers?.firstOrNull() private fun getSelectedPhoneNumber(): String? {
val numbers = getSelectedItems().firstOrNull()?.phoneNumbers
val primaryNumber = numbers?.firstOrNull { it.isPrimary }
return primaryNumber?.normalizedNumber ?: numbers?.firstOrNull()?.normalizedNumber
}
@SuppressLint("NewApi") @SuppressLint("NewApi")
private fun createShortcut() { private fun createShortcut() {