diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c03f6e28..e0c95c474 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -617,10 +617,6 @@
-
-
diff --git a/app/src/main/java/org/tasks/data/CaldavAccount.kt b/app/src/main/java/org/tasks/data/CaldavAccount.kt
index 6f863c497..f4144d03b 100644
--- a/app/src/main/java/org/tasks/data/CaldavAccount.kt
+++ b/app/src/main/java/org/tasks/data/CaldavAccount.kt
@@ -22,7 +22,6 @@ import org.tasks.data.OpenTaskDao.Companion.isEteSync
import org.tasks.etebase.EtebaseAccountSettingsActivity
import org.tasks.etebase.EtebaseCalendarSettingsActivity
import org.tasks.etesync.EteSyncAccountSettingsActivity
-import org.tasks.etesync.EteSyncCalendarSettingsActivity
import org.tasks.opentasks.OpenTaskAccountSettingsActivity
import org.tasks.opentasks.OpenTasksListSettingsActivity
import org.tasks.security.KeyStoreEncryption
@@ -116,9 +115,8 @@ class CaldavAccount : Parcelable {
get() = accountType == TYPE_TASKS
fun listSettingsClass(): Class = when(accountType) {
- TYPE_ETESYNC -> EteSyncCalendarSettingsActivity::class.java
TYPE_LOCAL -> LocalListSettingsActivity::class.java
- TYPE_OPENTASKS -> OpenTasksListSettingsActivity::class.java
+ TYPE_ETESYNC, TYPE_OPENTASKS -> OpenTasksListSettingsActivity::class.java
TYPE_ETEBASE -> EtebaseCalendarSettingsActivity::class.java
else -> CaldavCalendarSettingsActivity::class.java
}
diff --git a/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
deleted file mode 100644
index e74888bb0..000000000
--- a/app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.tasks.etesync
-
-import dagger.hilt.android.lifecycle.HiltViewModel
-import org.tasks.data.CaldavAccount
-import org.tasks.ui.CompletableViewModel
-import javax.inject.Inject
-
-@Deprecated("use etebase")
-@HiltViewModel
-class CreateCalendarViewModel @Inject constructor(
- private val client: EteSyncClient) : CompletableViewModel() {
- suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) {
- run { client.forAccount(account).makeCollection(name, color) }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
deleted file mode 100644
index b3b6aa947..000000000
--- a/app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.tasks.etesync
-
-import dagger.hilt.android.lifecycle.HiltViewModel
-import org.tasks.data.CaldavAccount
-import org.tasks.data.CaldavCalendar
-import org.tasks.ui.ActionViewModel
-import javax.inject.Inject
-
-@Deprecated("use etebase")
-@HiltViewModel
-class DeleteCalendarViewModel @Inject constructor(
- private val client: EteSyncClient) : ActionViewModel() {
- suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) {
- run { client.forAccount(account).deleteCollection(calendar) }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.kt
deleted file mode 100644
index 9f7170e48..000000000
--- a/app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.tasks.etesync
-
-import android.os.Bundle
-import androidx.activity.viewModels
-import dagger.hilt.android.AndroidEntryPoint
-import org.tasks.caldav.BaseCaldavCalendarSettingsActivity
-import org.tasks.data.CaldavAccount
-import org.tasks.data.CaldavCalendar
-
-@Deprecated("use etebase")
-@AndroidEntryPoint
-class EteSyncCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() {
- private val createCalendarViewModel: CreateCalendarViewModel by viewModels()
- private val deleteCalendarViewModel: DeleteCalendarViewModel by viewModels()
- private val updateCalendarViewModel: UpdateCalendarViewModel by viewModels()
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
-
- createCalendarViewModel.observe(this, this::createSuccessful, this::requestFailed)
- deleteCalendarViewModel.observe(this, this::onDeleted, this::requestFailed)
- updateCalendarViewModel.observe(this, { updateCalendar() }, this::requestFailed)
- }
-
- override suspend fun createCalendar(caldavAccount: CaldavAccount, name: String, color: Int) =
- createCalendarViewModel.createCalendar(caldavAccount, name, color)
-
- override suspend fun updateNameAndColor(
- account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) =
- updateCalendarViewModel.updateCalendar(account, calendar, name, color)
-
- override suspend fun deleteCalendar(caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) =
- deleteCalendarViewModel.deleteCalendar(caldavAccount, caldavCalendar)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
deleted file mode 100644
index 3c8555b18..000000000
--- a/app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.tasks.etesync
-
-import dagger.hilt.android.lifecycle.HiltViewModel
-import org.tasks.data.CaldavAccount
-import org.tasks.data.CaldavCalendar
-import org.tasks.ui.CompletableViewModel
-import javax.inject.Inject
-
-@Deprecated("use etebase")
-@HiltViewModel
-class UpdateCalendarViewModel @Inject constructor(
- private val client: EteSyncClient): CompletableViewModel() {
- suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) {
- run { client.forAccount(account).updateCollection(calendar, name, color) }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/filters/FilterProvider.kt b/app/src/main/java/org/tasks/filters/FilterProvider.kt
index 8ba892fd1..1dc074c09 100644
--- a/app/src/main/java/org/tasks/filters/FilterProvider.kt
+++ b/app/src/main/java/org/tasks/filters/FilterProvider.kt
@@ -15,9 +15,16 @@ import org.tasks.activities.NavigationDrawerCustomization
import org.tasks.activities.TagSettingsActivity
import org.tasks.billing.Inventory
import org.tasks.caldav.BaseCaldavCalendarSettingsActivity
-import org.tasks.data.*
+import org.tasks.data.CaldavAccount
+import org.tasks.data.CaldavAccount.Companion.TYPE_ETESYNC
import org.tasks.data.CaldavAccount.Companion.TYPE_LOCAL
import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS
+import org.tasks.data.CaldavDao
+import org.tasks.data.FilterDao
+import org.tasks.data.GoogleTaskAccount
+import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.LocationDao
+import org.tasks.data.TagDataDao
import org.tasks.filters.NavigationDrawerSubheader.SubheaderType
import org.tasks.location.LocationPickerActivity
import org.tasks.preferences.HelpAndFeedback
@@ -228,7 +235,7 @@ class FilterProvider @Inject constructor(
caldavDao.getAccounts()
.ifEmpty { listOf(caldavDao.setupLocalAccount(context)) }
.filter { it.accountType != TYPE_LOCAL || preferences.getBoolean(R.string.p_lists_enabled, true) }
- .flatMap { caldavFilter(it, showCreate && it.accountType != TYPE_OPENTASKS) }
+ .flatMap { caldavFilter(it, showCreate && it.accountType != TYPE_OPENTASKS && it.accountType != TYPE_ETESYNC) }
private suspend fun caldavFilter(account: CaldavAccount, showCreate: Boolean): List =
listOf(