Fix unicode stripping for search

Fixes #1420
This commit is contained in:
moezbhatti
2019-09-29 18:43:23 -04:00
parent 8b8da9c58d
commit 748fc05cc0
5 changed files with 12 additions and 12 deletions
@@ -24,7 +24,6 @@ import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.extensions.mapNotNull
import com.moez.QKSMS.extensions.removeAccents
import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkAllSeen
import com.moez.QKSMS.interactor.MarkArchived
@@ -45,7 +44,6 @@ import com.moez.QKSMS.repository.SyncRepository
import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
@@ -175,7 +173,6 @@ class MainViewModel @Inject constructor(
view.queryChangedIntent
.debounce(200, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.map { query -> query.removeAccents() }
.withLatestFrom(state) { query, state ->
if (query.isEmpty() && state.page is Searching) {
newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
@@ -190,7 +187,7 @@ class MainViewModel @Inject constructor(
}
}
.observeOn(Schedulers.io())
.switchMap { query -> Observable.just(query).map { conversationRepo.searchConversations(it) } }
.map(conversationRepo::searchConversations)
.autoDisposable(view.scope())
.subscribe { data -> newState { copy(page = Searching(loading = false, data = data)) } }
@@ -31,6 +31,7 @@ import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.extensions.removeAccents
import com.moez.QKSMS.model.SearchResult
import kotlinx.android.synthetic.main.search_list_item.view.*
import javax.inject.Inject
@@ -64,7 +65,7 @@ class SearchAdapter @Inject constructor(
val query = result.query
val title = SpannableString(result.conversation.getTitle())
var index = title.indexOf(query, ignoreCase = true)
var index = title.removeAccents().indexOf(query, ignoreCase = true)
while (index >= 0) {
title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)