jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

properly handle contacts with multiple phone numbers

Browse source
This commit is contained in:
tibbi 2020-07-27 21:53:21 +02:00
parent cdad404b2a
commit 41fb730511
10 changed files with 58 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
View file

@ -64,7 +64,7 @@ class NewConversationActivity : SimpleActivity() {
val searchString = it
val filteredContacts = ArrayList<SimpleContact>()
allContacts.forEach {
if (it.phoneNumber.contains(searchString, true) || it.name.contains(searchString, true)) {
if (it.phoneNumbers.any { it.contains(searchString, true) } || it.name.contains(searchString, true)) {
filteredContacts.add(it)
}
}
@ -134,7 +134,7 @@ class NewConversationActivity : SimpleActivity() {
ContactsAdapter(this, contacts, contacts_list, null) {
hideKeyboard()
launchThreadActivity((it as SimpleContact).phoneNumber, it.name)
launchThreadActivity((it as SimpleContact).phoneNumbers.first(), it.name)
}.apply {
contacts_list.adapter = this
}
@ -143,7 +143,7 @@ class NewConversationActivity : SimpleActivity() {
}
private fun fillSuggestedContacts(callback: () -> Unit) {
val privateCursor = getMyContactsContentProviderCursorLoader().loadInBackground()
val privateCursor = getMyContactsCursor().loadInBackground()
ensureBackgroundThread {
privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
val suggestions = getSuggestedContacts(privateContacts)
@ -162,7 +162,7 @@ class NewConversationActivity : SimpleActivity() {
SimpleContactsHelper(this@NewConversationActivity).loadContactImage(contact.photoUri, suggested_contact_image, contact.name)
suggestions_holder.addView(this)
setOnClickListener {
launchThreadActivity(contact.phoneNumber, contact.name)
launchThreadActivity(contact.phoneNumbers.first(), contact.name)
}
}
}