Fix chips for local lists

pull/3268/head
Alex Baker 11 months ago
parent 4698b0f372
commit eac13c07a3

@ -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<Long?>()
val lastAndroidBackup = MutableLiveData<Long>()
val caldavAccounts: Flow<List<CaldavAccount>>
get() = caldavDao.watchAccounts()
get() = caldavDao.watchAccounts(exclude = listOf(TYPE_LOCAL))
private fun isStale(timestamp: Long?) =
timestamp != null

@ -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<List<CaldavAccount>>
abstract fun watchAccounts(exclude: List<Int> = emptyList()): Flow<List<CaldavAccount>>
@Query("""
SELECT *

Loading…
Cancel
Save