Skip to content

Refactoring search logic to use kotlin flows efficiently #5655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rapterjet2004 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Refactoring search logic to use kotlin flows efficiently #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9fcec80
WIP - redoing the querying logic to use combine
rapterjet2004 Dec 17, 2025
a6d26aa
WIP - converting message search functionality to a flow based approach
rapterjet2004 Dec 18, 2025
efcbc2c
WIP - moving the activity logic to my viewModel, and observing the re…
rapterjet2004 Dec 18, 2025
a574a15
WIP - this adds the conversations to the combine flow, which simplifi…
rapterjet2004 Dec 19, 2025
0327330
WIP - fixing refreshes
rapterjet2004 Dec 19, 2025
e2ca92c
linter
rapterjet2004 Dec 19, 2025
1268e89
fixing tests
rapterjet2004 Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/com/nextcloud/talk/contacts/ContactsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ package com.nextcloud.talk.contacts

import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.models.json.autocomplete.AutocompleteOverall
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
import com.nextcloud.talk.models.json.conversations.RoomOverall
import kotlinx.coroutines.flow.Flow

interface ContactsRepository {
suspend fun getContacts(user: User, searchQuery: String?, shareTypes: List<String>): AutocompleteOverall
Expand All @@ -23,4 +25,6 @@ interface ContactsRepository {
): RoomOverall

fun getImageUri(user: User, avatarId: String, requestBigSize: Boolean): String

fun getContactsFlow(user: User, searchQuery: String?): Flow<List<AutocompleteUser>>
}
27 changes: 27 additions & 0 deletions app/src/main/java/com/nextcloud/talk/contacts/ContactsRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ import com.nextcloud.talk.api.NcApiCoroutines
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.models.RetrofitBucket
import com.nextcloud.talk.models.json.autocomplete.AutocompleteOverall
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
import com.nextcloud.talk.models.json.conversations.RoomOverall
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.ContactUtils
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import javax.inject.Inject

class ContactsRepositoryImpl @Inject constructor(private val ncApiCoroutines: NcApiCoroutines) : ContactsRepository {
Expand Down Expand Up @@ -71,6 +74,30 @@ class ContactsRepositoryImpl @Inject constructor(private val ncApiCoroutines: Nc
requestBigSize
)

override fun getContactsFlow(user: User, searchQuery: String?): Flow<List<AutocompleteUser>> =
flow {
val credentials = ApiUtils.getCredentials(user.username, user.token)

val retrofitBucket: RetrofitBucket = ApiUtils.getRetrofitBucketForContactsSearchFor14(
user.baseUrl!!,
searchQuery
)

val shareTypes = mutableListOf(ShareType.User.shareType).toList()

val modifiedQueryMap: HashMap<String, Any> = HashMap(retrofitBucket.queryMap)
modifiedQueryMap["limit"] = ContactUtils.MAX_CONTACT_LIMIT
modifiedQueryMap["shareTypes[]"] = shareTypes
val response = ncApiCoroutines.getContactsWithSearchParam(
credentials,
retrofitBucket.url,
shareTypes,
modifiedQueryMap
)

emit(response.ocs?.data.orEmpty())
}

companion object {
private val TAG = ContactsRepositoryImpl::class.simpleName
}
Expand Down
170 changes: 12 additions & 158 deletions app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.chat.viewmodels.ChatViewModel
import com.nextcloud.talk.contacts.ContactsActivity

import com.nextcloud.talk.contacts.ContactsViewModel

import com.nextcloud.talk.contextchat.ContextChatView
import com.nextcloud.talk.contextchat.ContextChatViewModel
import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel
Expand All @@ -107,8 +105,6 @@ import com.nextcloud.talk.messagesearch.MessageSearchHelper
import com.nextcloud.talk.messagesearch.MessageSearchHelper.MessageSearchResults
import com.nextcloud.talk.models.domain.ConversationModel
import com.nextcloud.talk.models.json.conversations.ConversationEnums
import com.nextcloud.talk.models.json.converters.EnumActorTypeConverter
import com.nextcloud.talk.models.json.participants.Participant
import com.nextcloud.talk.repositories.unifiedsearch.UnifiedSearchRepository
import com.nextcloud.talk.settings.SettingsActivity
import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity
Expand Down Expand Up @@ -154,15 +150,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import io.reactivex.subjects.BehaviorSubject
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import org.apache.commons.lang3.builder.CompareToBuilder
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
Expand Down Expand Up @@ -383,6 +374,14 @@ class ConversationsListActivity :
}.collect()
}

lifecycleScope.launch {
conversationsListViewModel.searchResultFlow.collect { searchResults ->
if (adapter?.hasFilter() == true) {
adapter?.updateDataSet(searchResults)
}
}
}

conversationsListViewModel.getFederationInvitationsViewState.observe(this) { state ->
when (state) {
is ConversationsListViewModel.GetFederationInvitationsStartState -> {
Expand Down Expand Up @@ -456,46 +455,6 @@ class ConversationsListActivity :
}
}

lifecycleScope.launch {
conversationsListViewModel.openConversationsState.collect { state ->
when (state) {
is ConversationsListViewModel.OpenConversationsUiState.Success -> {
val openConversationItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
val headerTitle = resources!!.getString(R.string.openConversations)
for (conversation in state.conversations) {
var genericTextHeaderItem: GenericTextHeaderItem
if (!callHeaderItems.containsKey(headerTitle)) {
genericTextHeaderItem = GenericTextHeaderItem(headerTitle, viewThemeUtils)
callHeaderItems[headerTitle] = genericTextHeaderItem
}
val conversationItem = ConversationItem(
ConversationModel.mapToConversationModel(conversation, currentUser!!),
currentUser!!,
this@ConversationsListActivity,
callHeaderItems[headerTitle],
viewThemeUtils
)
openConversationItems.add(conversationItem)
}

mutex.withLock {
// Filters out all old open conversation items from the previous query
searchableConversationItems = searchableConversationItems.filter {
!(it is ConversationItem && it.header == callHeaderItems[headerTitle])
}.toMutableList()

searchableConversationItems.addAll(openConversationItems)
}
}
is ConversationsListViewModel.OpenConversationsUiState.Error -> {
handleHttpExceptions(state.exception)
}

else -> {}
}
}
}

lifecycleScope.launch {
conversationsListViewModel.getRoomsFlow
.onEach { list ->
Expand Down Expand Up @@ -528,52 +487,6 @@ class ConversationsListActivity :
}.collect()
}

lifecycleScope.launch {
contactsViewModel.contactsViewState.onEach { state ->
when (state) {
is ContactsViewModel.ContactsUiState.Success -> {
if (state.contacts.isNullOrEmpty()) return@onEach

val userItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
val actorTypeConverter = EnumActorTypeConverter()
var genericTextHeaderItem: GenericTextHeaderItem
for (autocompleteUser in state.contacts) {
val headerTitle = resources!!.getString(R.string.nc_user)
if (!callHeaderItems.containsKey(headerTitle)) {
genericTextHeaderItem = GenericTextHeaderItem(headerTitle, viewThemeUtils)
callHeaderItems[headerTitle] = genericTextHeaderItem
}

val participant = Participant()
participant.actorId = autocompleteUser.id
participant.actorType = actorTypeConverter.getFromString(autocompleteUser.source)
participant.displayName = autocompleteUser.label

val contactItem = ContactItem(
participant,
currentUser!!,
callHeaderItems[headerTitle],
viewThemeUtils
)

userItems.add(contactItem)
}

mutex.withLock {
// Filters out all old user items from the previous query
searchableConversationItems = searchableConversationItems.filter {
it !is ContactItem
}.toMutableList()

searchableConversationItems.addAll(userItems)
}
}

else -> {}
}
}.collect()
}

lifecycleScope.launch {
chatViewModel.backgroundPlayUIFlow.onEach { msg ->
binding.composeViewForBackgroundPlay.apply {
Expand Down Expand Up @@ -1007,8 +920,8 @@ class ConversationsListActivity :
initSearchDisposable()
adapter?.setHeadersShown(true)
adapter!!.showAllHeaders()
searchableConversationItems.addAll(conversationItemsWithHeader)
if (!hasFilterEnabled()) filterableConversationItems = searchableConversationItems
// adapter!!.updateDataSet(filterableConversationItems, false)
binding.swipeRefreshLayoutView.isEnabled = false
searchBehaviorSubject.onNext(true)
return true
Expand Down Expand Up @@ -1459,74 +1372,15 @@ class ConversationsListActivity :

private fun performFilterAndSearch(filter: String?) {
if (filter!!.length >= SEARCH_MIN_CHARS) {
clearMessageSearchResults()
binding.noArchivedConversationLayout.visibility = View.GONE
binding.swipeRefreshLayoutView.isRefreshing = true

lifecycleScope.launch {
// gets users, updates collector async, which adds them to searchableConversationItems
val deferred1 = async {
fetchUsers(filter)
}

// gets open conversations, updates collector async, which adds them to searchableConversationItems
val deferred2 = async {
fetchOpenConversations(filter)
}

awaitAll(deferred1, deferred2)

// Waits until both work in collectors is over, to avoid data races
mutex.withLock {
if (hasFilterEnabled()) {
val headerTitle = resources!!.getString(R.string.openConversations)

fun AbstractFlexibleItem<*>.isRegularConversationItem() =
this is ConversationItem && this.header != callHeaderItems[headerTitle]

// Only keeps the Open Conversations, Users
val list = searchableConversationItems.filter {
!it.isRegularConversationItem()
}.toMutableList()

// Only keeps the conversation items with the applied Nextcloud filter [mention/archive/unread]
filterableConversationItems = filterableConversationItems.filter {
it.isRegularConversationItem()
}.toMutableList()

filterableConversationItems.addAll(list)
adapter?.updateDataSet(filterableConversationItems)

adapter?.setFilter(filter)
adapter?.filterItems()
} else {
// Conversation Items without Nextcloud filter + Open conversations/users
adapter?.updateDataSet(searchableConversationItems)
adapter?.setFilter(filter)
adapter?.filterItems()
}
}

if (hasSpreedFeatureCapability(
currentUser?.capabilities?.spreedCapability,
SpreedFeatures.UNIFIED_SEARCH
)
) {
// gets messages async, adds them to the adapter, but NOT the searchableConversationItems
startMessageSearch(filter)
}

withContext(Dispatchers.Main) {
binding.swipeRefreshLayoutView.isRefreshing = false
}
}
adapter?.setFilter(filter)
conversationsListViewModel.getSearchQuery(context, filter)
} else {
resetSearchResults()
}
}

private fun resetSearchResults() {
clearMessageSearchResults()
adapter?.updateDataSet(conversationItems)
adapter?.setFilter("")
adapter?.filterItems()
Expand Down Expand Up @@ -1605,7 +1459,7 @@ class ConversationsListActivity :
}

is LoadMoreResultsItem -> {
loadMoreMessages()
conversationsListViewModel.loadMoreMessages(context)
}

is ConversationItem -> {
Expand Down
Loading
Loading