From a065e715f35d7b0826e33d07b832c41ae0a722c1 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 10 May 2024 13:25:38 +0200 Subject: [PATCH] Don't show frequently used apps in favorites if they are set as hidden Close #799 --- .../main/java/de/mm20/launcher2/database/SearchableDao.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4b60e6dd..b1ad60d8 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 @@ -35,7 +35,7 @@ interface SearchableDao { "WHERE (" + "(:manuallySorted AND pinPosition > 1) OR " + "(:automaticallySorted AND pinPosition = 1) OR" + - "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " + + "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0 AND hidden = 0) OR " + "(:hidden AND hidden = 1)" + ") AND hidden = :hidden ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit" ) @@ -53,7 +53,7 @@ interface SearchableDao { "(" + "(:manuallySorted AND pinPosition > 1) OR " + "(:automaticallySorted AND pinPosition = 1) OR" + - "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " + + "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0 AND hidden = 0) OR " + "(:hidden AND hidden = 1)" + ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit" ) @@ -72,7 +72,7 @@ interface SearchableDao { "(" + "(:manuallySorted AND pinPosition > 1) OR " + "(:automaticallySorted AND pinPosition = 1) OR" + - "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0) OR " + + "(:frequentlyUsed AND pinPosition = 0 AND launchCount > 0 AND hidden = 0) OR " + "(:hidden AND hidden = 1)" + ") ORDER BY pinPosition DESC, weight DESC, launchCount DESC LIMIT :limit" )