Remove accountCount from OpenTaskDao

pull/1066/head
Alex Baker 5 years ago
parent a04f617fff
commit 5dfdd75327

@ -24,9 +24,6 @@ class OpenTaskDao @Inject constructor(@ApplicationContext context: Context) {
suspend fun accounts(): List<String> = getLists().map { it.account!! }.distinct() suspend fun accounts(): List<String> = getLists().map { it.account!! }.distinct()
@Deprecated("add davx5/etesync accounts manually")
suspend fun accountCount(): Int = accounts().size
suspend fun getLists(): List<CaldavCalendar> = withContext(Dispatchers.IO) { suspend fun getLists(): List<CaldavCalendar> = withContext(Dispatchers.IO) {
val calendars = ArrayList<CaldavCalendar>() val calendars = ArrayList<CaldavCalendar>()
cr.query( cr.query(

@ -9,7 +9,6 @@ import org.tasks.R
import org.tasks.analytics.Firebase import org.tasks.analytics.Firebase
import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS
import org.tasks.data.CaldavDao import org.tasks.data.CaldavDao
import org.tasks.data.OpenTaskDao
import org.tasks.opentasks.OpenTasksSynchronizer import org.tasks.opentasks.OpenTasksSynchronizer
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -20,14 +19,12 @@ class SyncOpenTasksWork @WorkerInject constructor(
localBroadcastManager: LocalBroadcastManager, localBroadcastManager: LocalBroadcastManager,
preferences: Preferences, preferences: Preferences,
private val openTasksSynchronizer: OpenTasksSynchronizer, private val openTasksSynchronizer: OpenTasksSynchronizer,
private val caldavDao: CaldavDao, private val caldavDao: CaldavDao
private val openTaskDao: OpenTaskDao
) : SyncWork(context, workerParams, firebase, localBroadcastManager, preferences) { ) : SyncWork(context, workerParams, firebase, localBroadcastManager, preferences) {
override val syncStatus = R.string.p_sync_ongoing_opentasks override val syncStatus = R.string.p_sync_ongoing_opentasks
override suspend fun enabled() = override suspend fun enabled() =
caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty() caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty()
|| openTaskDao.accountCount() > 0
override suspend fun doSync() { override suspend fun doSync() {
openTasksSynchronizer.sync() openTasksSynchronizer.sync()

@ -47,8 +47,8 @@ class WorkManagerImpl constructor(
private val context: Context, private val context: Context,
private val preferences: Preferences, private val preferences: Preferences,
private val googleTaskListDao: GoogleTaskListDao, private val googleTaskListDao: GoogleTaskListDao,
private val caldavDao: CaldavDao, private val caldavDao: CaldavDao
private val openTaskDao: OpenTaskDao): WorkManager { ): WorkManager {
private val throttle = Throttle(200, 60000, "WORK") private val throttle = Throttle(200, 60000, "WORK")
private val alarmManager: AlarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager private val alarmManager: AlarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
private val workManager = androidx.work.WorkManager.getInstance(context) private val workManager = androidx.work.WorkManager.getInstance(context)
@ -151,7 +151,7 @@ class WorkManagerImpl constructor(
scheduleBackgroundSync( scheduleBackgroundSync(
TAG_BACKGROUND_SYNC_OPENTASKS, TAG_BACKGROUND_SYNC_OPENTASKS,
SyncOpenTasksWork::class.java, SyncOpenTasksWork::class.java,
enabled && (caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty() || openTaskDao.accountCount() > 0)) enabled && caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty())
} }
} }

@ -90,7 +90,5 @@ class SyncAdapters @Inject constructor(
private suspend fun isEteSyncEnabled() = caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty() private suspend fun isEteSyncEnabled() = caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty()
private suspend fun isOpenTaskSyncEnabled() = private suspend fun isOpenTaskSyncEnabled() = caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty()
caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty()
|| openTaskDao.accountCount() > 0
} }
Loading…
Cancel
Save