From a4b6212a7edba5bd9aeec5f6cf8625a1fdb5b8f4 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 29 Jan 2022 19:42:47 +0100 Subject: [PATCH] Exclude calendar events from favorites Pinned favorites are already shown in calendar widget --- .../src/main/java/de/mm20/launcher2/database/SearchDao.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt b/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt index 1d3974f3..4a6f2521 100644 --- a/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt +++ b/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt @@ -18,7 +18,7 @@ interface SearchDao { @Insert(onConflict = OnConflictStrategy.IGNORE) fun insertSkipExisting(items: FavoritesItemEntity) - @Query("SELECT * FROM Searchable WHERE pinned > 0 ORDER BY pinned DESC, launchCount DESC") + @Query("SELECT * FROM Searchable WHERE pinned > 0 AND NOT `key` LIKE 'calendar://%' ORDER BY pinned DESC, launchCount DESC") fun getFavorites(): Flow> @Query("SELECT * FROM Searchable WHERE pinned > 0 AND `key` LIKE 'calendar://%' ORDER BY pinned DESC, launchCount DESC") @@ -28,7 +28,7 @@ interface SearchDao { @Query("SELECT COUNT(key) as count FROM Searchable WHERE pinned = 1;") fun getPinCount(): Int - @Query("SELECT * FROM Searchable WHERE pinned = 0 AND launchCount > 0 AND hidden = 0 ORDER BY launchCount DESC LIMIT :count") + @Query("SELECT * FROM Searchable WHERE pinned = 0 AND launchCount > 0 AND hidden = 0 AND NOT `key` LIKE 'calendar://%' ORDER BY launchCount DESC LIMIT :count") fun getAutoFavorites(count: Int): List @Query("DELETE FROM Searchable WHERE `key` IN (:keys)")