archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove legacy EteSync v1 list management features

Browse Source
pull/1401/head
Alex Baker 3 years ago
parent d4c01e16fd
commit 02009e64d7
7 changed files with 10 additions and 90 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -617,10 +617,6 @@
<activity android:name=".tags.TagPickerActivity" />
<activity
android:name=".etesync.EteSyncCalendarSettingsActivity"
android:theme="@style/Tasks" />
<activity
android:name=".etesync.EncryptionSettingsActivity"
android:theme="@style/Tasks" />

4
app/src/main/java/org/tasks/data/CaldavAccount.kt
Unescape Escape View File

@ -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<out BaseListSettingsActivity> = 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
}

15
app/src/main/java/org/tasks/etesync/CreateCalendarViewModel.kt
Unescape Escape View File

@ -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<String?>() {
suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) {
run { client.forAccount(account).makeCollection(name, color) }
}
}

16
app/src/main/java/org/tasks/etesync/DeleteCalendarViewModel.kt
Unescape Escape View File

@ -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) }
}
}

34
app/src/main/java/org/tasks/etesync/EteSyncCalendarSettingsActivity.kt
Unescape Escape View File

@ -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)
}

16
app/src/main/java/org/tasks/etesync/UpdateCalendarViewModel.kt
Unescape Escape View File

@ -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<String?>() {
suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) {
run { client.forAccount(account).updateCollection(calendar, name, color) }
}
}

11
app/src/main/java/org/tasks/filters/FilterProvider.kt
Unescape Escape View File

@ -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<FilterListItem> =
listOf(

Write Preview
Loading…
Cancel
Save