Fix search not recognizing special characters

The query doesn't need to be normalized anyway
This commit is contained in:
Inhishonor
2025-12-16 13:25:21 -08:00
parent b4bce2c1a9
commit 5e9b3a9d11
@@ -24,7 +24,6 @@ import dev.octoshrimpy.quik.compat.TelephonyCompat
import dev.octoshrimpy.quik.extensions.anyOf import dev.octoshrimpy.quik.extensions.anyOf
import dev.octoshrimpy.quik.extensions.asObservable import dev.octoshrimpy.quik.extensions.asObservable
import dev.octoshrimpy.quik.extensions.map import dev.octoshrimpy.quik.extensions.map
import dev.octoshrimpy.quik.extensions.removeAccents
import dev.octoshrimpy.quik.filter.ConversationFilter import dev.octoshrimpy.quik.filter.ConversationFilter
import dev.octoshrimpy.quik.mapper.CursorToConversation import dev.octoshrimpy.quik.mapper.CursorToConversation
import dev.octoshrimpy.quik.mapper.CursorToRecipient import dev.octoshrimpy.quik.mapper.CursorToRecipient
@@ -143,7 +142,7 @@ class ConversationRepositoryImpl @Inject constructor(
override fun searchConversations(query: CharSequence): List<SearchResult> { override fun searchConversations(query: CharSequence): List<SearchResult> {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val normalizedQuery = query.removeAccents() val searchQuery = query.toString()
val conversations = realm.copyFromRealm(realm val conversations = realm.copyFromRealm(realm
.where(Conversation::class.java) .where(Conversation::class.java)
.notEqualTo("id", 0L) .notEqualTo("id", 0L)
@@ -156,24 +155,24 @@ class ConversationRepositoryImpl @Inject constructor(
val messagesByConversation = realm.copyFromRealm(realm val messagesByConversation = realm.copyFromRealm(realm
.where(Message::class.java) .where(Message::class.java)
.beginGroup() .beginGroup()
.contains("body", normalizedQuery, Case.INSENSITIVE) .contains("body", searchQuery, Case.INSENSITIVE)
.or() .or()
.contains("parts.text", normalizedQuery, Case.INSENSITIVE) .contains("parts.text", searchQuery, Case.INSENSITIVE)
.endGroup() .endGroup()
.findAll()) .findAll())
.groupBy { message -> message.threadId } .groupBy { message -> message.threadId }
.filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null } .filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null }
.map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) } .map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) }
.map { (conversation, messages) -> SearchResult(normalizedQuery, conversation, messages) } .map { (conversation, messages) -> SearchResult(searchQuery, conversation, messages) }
.sortedByDescending { result -> result.messages } .sortedByDescending { result -> result.messages }
.toList() .toList()
realm.close() realm.close()
return conversations return conversations
.filter { conversation -> conversationFilter.filter(conversation, normalizedQuery) } .filter { conversation -> conversationFilter.filter(conversation, searchQuery) }
.map { .map {
conversation -> SearchResult(normalizedQuery, conversation, 0) conversation -> SearchResult(searchQuery, conversation, 0)
} + messagesByConversation } + messagesByConversation
} }