Skip to content

Remove the need for stateflow for conversation list #1776

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

Merged
SessionHero01 merged 2 commits into from
Dec 15, 2025
Merged

Remove the need for stateflow for conversation list #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0a42de
Remove the need for stateflow for conversation list
SessionHero01 Dec 14, 2025
d5ed05c
Tidy up
SessionHero01 Dec 15, 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
15 changes: 4 additions & 11 deletions app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.debounce
Expand All @@ -21,10 +22,7 @@ import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.database.ThreadDatabase
import org.thoughtcrime.securesms.dependencies.ConfigFactory
import org.thoughtcrime.securesms.search.SearchRepository
import org.thoughtcrime.securesms.search.model.SearchResult
import javax.inject.Inject
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine

@OptIn(ExperimentalCoroutinesApi::class)
@HiltViewModel
Expand All @@ -45,9 +43,9 @@ class GlobalSearchViewModel @Inject constructor(
configFactory.configUpdateNotifications
)

val noteToSelfString by lazy { application.getString(R.string.noteToSelf).lowercase() }
val noteToSelfString: String by lazy { application.getString(R.string.noteToSelf).lowercase() }

val result = combine(
val result: SharedFlow<GlobalSearchResult> = combine(
_queryText,
observeChangesAffectingSearch().onStart { emit(Unit) }
) { query, _ -> query }
Expand All @@ -64,7 +62,7 @@ class GlobalSearchViewModel @Inject constructor(
)
}
} else {
val results = searchRepository.suspendQuery(query).toGlobalSearchResult()
val results = searchRepository.query(query).toGlobalSearchResult()

// show "Note to Self" is the user searches for parts of"Note to Self"
if(noteToSelfString.contains(query.lowercase())){
Expand All @@ -85,8 +83,3 @@ class GlobalSearchViewModel @Inject constructor(
}
}

private suspend fun SearchRepository.suspendQuery(query: String): SearchResult {
return suspendCoroutine { cont ->
query(query, cont::resume)
}
}
Loading