From 03550ced91ffa5b49508684322223c7868c5227b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 14 Aug 2020 14:13:44 -0500 Subject: [PATCH] Pass account to sync --- .../org/tasks/opentasks/OpenTasksSynchronizer.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt index d2ee0b597..d78fa1979 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt @@ -26,7 +26,6 @@ import org.tasks.caldav.CaldavConverter import org.tasks.caldav.CaldavConverter.toRemote import org.tasks.caldav.iCalendar import org.tasks.data.* -import org.tasks.data.OpenTaskDao.Companion.ACCOUNT_TYPE_ETESYNC import org.tasks.data.OpenTaskDao.Companion.getInt import org.tasks.data.OpenTaskDao.Companion.getLong import org.tasks.data.OpenTaskDao.Companion.getString @@ -83,7 +82,7 @@ class OpenTasksSynchronizer @Inject constructor( .forEach { taskDeleter.delete(it) } lists.forEach { val calendar = toLocalCalendar(account.uuid!!, it) - sync(calendar, it.ctag, it.id) + sync(account, calendar, it.ctag, it.id) } setError(account, null) } @@ -106,9 +105,14 @@ class OpenTasksSynchronizer @Inject constructor( return local } - private suspend fun sync(calendar: CaldavCalendar, ctag: String?, listId: Long) { + private suspend fun sync( + account: CaldavAccount, + calendar: CaldavCalendar, + ctag: String?, + listId: Long + ) { Timber.d("SYNC $calendar") - val isEteSync = calendar.account!!.split(":")[0] == ACCOUNT_TYPE_ETESYNC + val isEteSync = account.isOpenTaskEteSync val moved = caldavDao.getMoved(calendar.uuid!!) val (deleted, updated) =