From e70e0e156bdfca599516a6a05beec525459cd6ca Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 17 Jan 2019 13:31:35 +0100
Subject: [PATCH] Fixed bug where defaults would override filtered settings
---
.../de/kuschku/quasseldroid/persistence/QuasselDatabase.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index 58a2f15e0..5ac9d4e44 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -131,10 +131,10 @@ abstract class QuasselDatabase : RoomDatabase() {
@Query("UPDATE filtered SET filtered = :filtered WHERE accountId = :accountId AND bufferId = :bufferId")
fun setFiltered(accountId: Long, bufferId: Int, filtered: Int)
- @Query("SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :defaultValue as filtered ORDER BY filtered DESC LIMIT 1")
+ @Query("SELECT IFNULL(t.filtered, :defaultValue) FROM (SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT NULL ORDER BY filtered DESC LIMIT 1) t")
fun get(accountId: Long, bufferId: Int, defaultValue: Int): Int
- @Query("SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :defaultValue as filtered ORDER BY filtered DESC LIMIT 1")
+ @Query("SELECT IFNULL(t.filtered, :defaultValue) FROM (SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT NULL ORDER BY filtered DESC LIMIT 1) t")
fun listen(accountId: Long, bufferId: Int, defaultValue: Int): LiveData<Int>
@Query("SELECT * FROM filtered WHERE accountId = :accountId")
--
GitLab