Allow normalized search when filtering contacts

This commit is contained in:
Moez Bhatti
2018-04-15 15:04:48 -04:00
parent 5ce26001de
commit 4d368af1cd
4 changed files with 38 additions and 2 deletions
@@ -19,12 +19,13 @@
package common.util.filter
import model.Contact
import util.extensions.removeAccents
import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter<Contact>() {
override fun filter(item: Contact, query: CharSequence): Boolean {
return item.name.contains(query, true) || // Name
return item.name.removeAccents().contains(query, true) || // Name
item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number
}
@@ -61,6 +61,7 @@ import repository.MessageRepository
import util.extensions.asObservable
import util.extensions.isImage
import util.extensions.mapNotNull
import util.extensions.removeAccents
import java.net.URLDecoder
import java.util.*
import java.util.concurrent.TimeUnit
@@ -206,9 +207,14 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
// that have already been selected
Observables
.combineLatest(view.queryChangedIntent, contacts, selectedContacts, { query, contacts, selectedContacts ->
// Strip the accents from the query. This can be an expensive operation, so
// cache the result instead of doing it for each contact
val normalizedQuery = query.removeAccents()
var filteredContacts = contacts
.filterNot { contact -> selectedContacts.contains(contact) }
.filter { contact -> contactFilter.filter(contact, query) }
.filter { contact -> contactFilter.filter(contact, normalizedQuery) }
// If the entry is a valid destination, allow it as a recipient
if (PhoneNumberUtils.isWellFormedSmsAddress(query.toString())) {
@@ -45,6 +45,7 @@ import io.realm.Realm
import model.SyncLog
import repository.MessageRepository
import util.Preferences
import util.extensions.removeAccents
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@@ -117,6 +118,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
view.queryChangedIntent
.debounce(200, TimeUnit.MILLISECONDS)
.map { query -> query.removeAccents() }
.withLatestFrom(state, { query, state ->
if (state.page is Inbox) {
val filteredConversations = if (query.isEmpty()) conversations