From eac13c07a32ff8ddc2fdb270ba80c75a2dfdef26 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 18 Jan 2025 01:43:30 -0600 Subject: [PATCH] Fix chips for local lists --- .../main/java/org/tasks/preferences/PreferencesViewModel.kt | 3 ++- data/src/commonMain/kotlin/org/tasks/data/dao/CaldavDao.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt index e280b6ea7..13e9f7919 100644 --- a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt +++ b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt @@ -17,6 +17,7 @@ import org.tasks.R import org.tasks.backup.BackupConstants import org.tasks.data.dao.CaldavDao import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_LOCAL import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.googleapis.InvokerFactory import org.tasks.gtasks.GoogleAccountManager @@ -37,7 +38,7 @@ class PreferencesViewModel @Inject constructor( val lastDriveBackup = MutableLiveData() val lastAndroidBackup = MutableLiveData() val caldavAccounts: Flow> - get() = caldavDao.watchAccounts() + get() = caldavDao.watchAccounts(exclude = listOf(TYPE_LOCAL)) private fun isStale(timestamp: Long?) = timestamp != null diff --git a/data/src/commonMain/kotlin/org/tasks/data/dao/CaldavDao.kt b/data/src/commonMain/kotlin/org/tasks/data/dao/CaldavDao.kt index 0e29b18ee..6c7fba228 100644 --- a/data/src/commonMain/kotlin/org/tasks/data/dao/CaldavDao.kt +++ b/data/src/commonMain/kotlin/org/tasks/data/dao/CaldavDao.kt @@ -63,13 +63,13 @@ abstract class CaldavDao(private val database: Database) { @Query(""" SELECT * FROM caldav_accounts -WHERE cda_account_type != $TYPE_LOCAL +WHERE cda_account_type NOT IN (:exclude) ORDER BY CASE cda_account_type WHEN $TYPE_TASKS THEN 0 ELSE 1 END, UPPER(cda_name) """) - abstract fun watchAccounts(): Flow> + abstract fun watchAccounts(exclude: List = emptyList()): Flow> @Query(""" SELECT *