combine -> merge

2021-12-31 21:50:09 +01:00 · 2021-12-31 21:50:09 +01:00 · 912982aba8
commit 912982aba8
parent 63e5c1337c
1 changed files with 1 additions and 3 deletions
--- a/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt
+++ b/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt
@ -204,9 +204,7 @@ class AppRepositoryImpl(

    override fun search(query: String): Flow<List<Application>> = channelFlow {

-        combine(installedApps, hiddenItems, installations) {_, _, _ ->
-            null
-        }.collectLatest {
+        merge(installedApps, hiddenItems, installations).collectLatest {
            withContext(Dispatchers.IO) {
                val appResults = mutableListOf<Application>()
                if (query.isEmpty()) {