From 912982aba87c761535dd0c41f309af579829187c Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 31 Dec 2021 21:50:09 +0100
Subject: [PATCH] combine -> merge

---
 .../main/java/de/mm20/launcher2/applications/AppRepository.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt b/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt
index 4252ced6..0a835652 100644
--- 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()) {