karol/quik
0
0
Fork 0
forked from upstream-mirrors/quik
Code Pull Requests Actions Releases 10 Activity

Fix unicode stripping for search

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
+1 -1
View File
@@ -23,4 +23,4 @@ import java.text.Normalizer
/**
* Strip the accents from a string
*/
fun CharSequence.removeAccents() = Normalizer.normalize(this, Normalizer.Form.NFD)
fun CharSequence.removeAccents(): String = Normalizer.normalize(this, Normalizer.Form.NFKD).replace(Regex("\\p{M}"), "")
data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
+7 -5
View File
@@ -25,6 +25,7 @@ import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.compat.TelephonyCompat
import com.moez.QKSMS.extensions.anyOf
import com.moez.QKSMS.extensions.map
import com.moez.QKSMS.extensions.removeAccents
import com.moez.QKSMS.filter.ConversationFilter
import com.moez.QKSMS.mapper.CursorToConversation
import com.moez.QKSMS.mapper.CursorToRecipient
@@ -100,22 +101,23 @@ class ConversationRepositoryImpl @Inject constructor(
}
}
override fun searchConversations(query: String): List<SearchResult> {
override fun searchConversations(query: CharSequence): List<SearchResult> {
val normalizedQuery = query.removeAccents()
val conversations = getConversationsSnapshot()
val messagesByConversation = Realm.getDefaultInstance()
.where(Message::class.java)
.contains("body", query, Case.INSENSITIVE)
.contains("body", normalizedQuery, Case.INSENSITIVE)
.findAll()
.groupBy { message -> message.threadId }
.filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null }
.map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) }
.map { (conversation, messages) -> SearchResult(query, conversation, messages) }
.map { (conversation, messages) -> SearchResult(normalizedQuery, conversation, messages) }
.sortedByDescending { result -> result.messages }
return conversations
.filter { conversation -> conversationFilter.filter(conversation, query) }
.map { conversation -> SearchResult(query, conversation, 0) }
.filter { conversation -> conversationFilter.filter(conversation, normalizedQuery) }
.map { conversation -> SearchResult(normalizedQuery, conversation, 0) }
.plus(messagesByConversation)
}