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

updating commons, handle SimpleContact having multiple numbers

Browse Source
This commit is contained in:
tibbi
2020-07-12 15:50:57 +02:00
parent ae9eb4f320
commit cdd9efe4e9
8 changed files with 9 additions and 9 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 { dependencies {
implementation 'com.simplemobiletools:commons:5.29.13' implementation 'com.simplemobiletools:commons:5.29.16'
implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a' implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a'
} }

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

@ -201,7 +201,7 @@ class DialpadActivity : SimpleActivity() {
}) })
ContactsAdapter(this, filtered, dialpad_list, null, text) { ContactsAdapter(this, filtered, dialpad_list, null, text) {
startCallIntent((it as SimpleContact).phoneNumber) startCallIntent((it as SimpleContact).phoneNumbers.first())
}.apply { }.apply {
dialpad_list.adapter = this dialpad_list.adapter = this
} }

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

@ -45,7 +45,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener {
SelectContactDialog(this, allContacts) { selectedContact -> SelectContactDialog(this, allContacts) { selectedContact ->
speedDialValues.first { it.id == clickedContact.id }.apply { speedDialValues.first { it.id == clickedContact.id }.apply {
displayName = selectedContact.name displayName = selectedContact.name
number = selectedContact.phoneNumber number = selectedContact.phoneNumbers.first()
} }
updateAdapter() updateAdapter()
} }

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

@ -147,7 +147,7 @@ class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList<SimpleCo
activity.handlePermission(PERMISSION_CALL_PHONE) { hasPermission -> activity.handlePermission(PERMISSION_CALL_PHONE) { hasPermission ->
val action = if (hasPermission) Intent.ACTION_CALL else Intent.ACTION_DIAL val action = if (hasPermission) Intent.ACTION_CALL else Intent.ACTION_DIAL
val intent = Intent(action).apply { 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()) val shortcut = ShortcutInfo.Builder(activity, contact.hashCode().toString())

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

@ -76,7 +76,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
val currAdapter = fragment_list.adapter val currAdapter = fragment_list.adapter
if (currAdapter == null) { if (currAdapter == null) {
ContactsAdapter(activity as SimpleActivity, contacts, fragment_list, this, showDeleteButton = false) { ContactsAdapter(activity as SimpleActivity, contacts, fragment_list, this, showDeleteButton = false) {
activity?.launchCallIntent((it as SimpleContact).phoneNumber) activity?.launchCallIntent((it as SimpleContact).phoneNumbers.first())
}.apply { }.apply {
fragment_list.adapter = this fragment_list.adapter = this
} }

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

@ -50,7 +50,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
recents.filter { it.phoneNumber == it.name }.forEach { recent -> recents.filter { it.phoneNumber == it.name }.forEach { recent ->
var wasNameFilled = false var wasNameFilled = false
if (privateContacts.isNotEmpty()) { if (privateContacts.isNotEmpty()) {
val privateContact = privateContacts.firstOrNull { it.phoneNumber == recent.phoneNumber } val privateContact = privateContacts.firstOrNull { it.phoneNumbers.first() == recent.phoneNumber }
if (privateContact != null) { if (privateContact != null) {
recent.name = privateContact.name recent.name = privateContact.name
wasNameFilled = true wasNameFilled = true
@ -58,7 +58,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
} }
if (!wasNameFilled) { if (!wasNameFilled) {
val contact = contacts.firstOrNull { it.phoneNumber == recent.phoneNumber } val contact = contacts.firstOrNull { it.phoneNumbers.first() == recent.phoneNumber }
if (contact != null) { if (contact != null) {
recent.name = contact.name recent.name = contact.name
} }

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

@ -74,7 +74,7 @@ class CallManager {
val privateCursor = context.getMyContactsCursor().loadInBackground() val privateCursor = context.getMyContactsCursor().loadInBackground()
ensureBackgroundThread { ensureBackgroundThread {
val privateContacts = MyContactsContentProvider.getSimpleContacts(context, privateCursor) 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) { if (privateContact != null) {
callContact.name = privateContact.name callContact.name = privateContact.name
} }

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

@ -71,7 +71,7 @@ class RecentsHelper(private val context: Context) {
val normalizedNumber = number.normalizePhoneNumber() val normalizedNumber = number.normalizePhoneNumber()
if (normalizedNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) { if (normalizedNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) {
name = contacts.firstOrNull { contact -> name = contacts.firstOrNull { contact ->
val curNumber = contact.phoneNumber.normalizePhoneNumber() val curNumber = contact.phoneNumbers.first().normalizePhoneNumber()
if (curNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) { if (curNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) {
if (curNumber.substring(curNumber.length - COMPARABLE_PHONE_NUMBER_LENGTH) == normalizedNumber.substring(normalizedNumber.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 contactsNumbersMap[number] = contact.name