From fcf65784507fa23ce3b5d6cee10df86c6ad5e343 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 21 Apr 2024 01:49:09 +0200
Subject: [PATCH] Hiding an item no longer removes it from favorites and vice
 versa

---
 .../src/main/java/de/mm20/launcher2/database/SearchableDao.kt | 4 ++--
 .../de/mm20/launcher2/services/favorites/FavoritesService.kt  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt
index f2c80bda..4b60e6dd 100644
--- a/data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt
+++ b/data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt
@@ -55,7 +55,7 @@ interface SearchableDao {
                 "(:automaticallySorted AND pinPosition = 1) OR" +
                 "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " +
                 "(:hidden AND hidden = 1)" +
-                ") AND hidden = :hidden ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
+                ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
     )
     fun getIncludeTypes(
         includeTypes: List<String>?,
@@ -74,7 +74,7 @@ interface SearchableDao {
                 "(:automaticallySorted AND pinPosition = 1) OR" +
                 "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " +
                 "(:hidden AND hidden = 1)" +
-                ") AND hidden = :hidden ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
+                ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit"
     )
     fun getExcludeTypes(
         excludeTypes: List<String>?,
diff --git a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt
index 526bfd89..5af99db1 100644
--- a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt
+++ b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt
@@ -16,7 +16,6 @@ class FavoritesService(
         limit: Int = 100,
     ): Flow<List<SavableSearchable>> {
         return searchableRepository.get(
-            hidden = false,
             includeTypes = includeTypes,
             excludeTypes = excludeTypes,
             manuallySorted = manuallySorted,
@@ -38,7 +37,6 @@ class FavoritesService(
         searchableRepository.upsert(
             searchable,
             pinned = true,
-            hidden = false,
         )
     }
 
@@ -63,7 +61,6 @@ class FavoritesService(
         searchableRepository.upsert(
             searchable,
             hidden = true,
-            pinned = false,
         )
     }