Include archived conversations in search results

This commit is contained in:
Moez Bhatti
2019-11-28 02:53:53 -05:00
parent ca8b263f09
commit 6bd8480e4e
@@ -112,17 +112,26 @@ class ConversationRepositoryImpl @Inject constructor(
}
override fun searchConversations(query: CharSequence): List<SearchResult> {
val normalizedQuery = query.removeAccents()
val conversations = getConversationsSnapshot()
val realm = Realm.getDefaultInstance()
val messagesByConversation = Realm.getDefaultInstance()
val normalizedQuery = query.removeAccents()
val conversations = realm.copyFromRealm(realm
.where(Conversation::class.java)
.notEqualTo("id", 0L)
.isNotNull("lastMessage")
.equalTo("blocked", false)
.isNotEmpty("recipients")
.sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
.findAll())
val messagesByConversation = realm.copyFromRealm(realm
.where(Message::class.java)
.beginGroup()
.contains("body", normalizedQuery, Case.INSENSITIVE)
.or()
.contains("parts.text", normalizedQuery, Case.INSENSITIVE)
.endGroup()
.findAll()
.findAll())
.asSequence()
.groupBy { message -> message.threadId }
.filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null }
@@ -131,10 +140,11 @@ class ConversationRepositoryImpl @Inject constructor(
.sortedByDescending { result -> result.messages }
.toList()
realm.close()
return conversations
.filter { conversation -> conversationFilter.filter(conversation, normalizedQuery) }
.map { conversation -> SearchResult(normalizedQuery, conversation, 0) }
.plus(messagesByConversation)
.map { conversation -> SearchResult(normalizedQuery, conversation, 0) } + messagesByConversation
}
override fun getBlockedConversations(): RealmResults<Conversation> {