From 9eaa7a7408044a5bec743d6f829cad6d8aa72451 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 14 Aug 2020 12:58:07 -0500 Subject: [PATCH] Hide repeat setting from etesync opentask accounts --- app/src/main/java/org/tasks/data/CaldavAccount.kt | 4 ++++ .../org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/src/main/java/org/tasks/data/CaldavAccount.kt b/app/src/main/java/org/tasks/data/CaldavAccount.kt index c33e5d840..35e9cf876 100644 --- a/app/src/main/java/org/tasks/data/CaldavAccount.kt +++ b/app/src/main/java/org/tasks/data/CaldavAccount.kt @@ -11,6 +11,7 @@ import com.todoroo.astrid.data.Task import org.tasks.activities.BaseListSettingsActivity import org.tasks.caldav.CaldavCalendarSettingsActivity import org.tasks.caldav.LocalListSettingsActivity +import org.tasks.data.OpenTaskDao.Companion.ACCOUNT_TYPE_ETESYNC import org.tasks.etesync.EteSyncCalendarSettingsActivity import org.tasks.opentasks.OpenTasksListSettingsActivity import org.tasks.security.KeyStoreEncryption @@ -89,6 +90,9 @@ class CaldavAccount : Parcelable { val isOpenTasks: Boolean get() = accountType == TYPE_OPENTASKS + val isOpenTaskEteSync: Boolean + get() = uuid?.split(":")?.get(0) == ACCOUNT_TYPE_ETESYNC + fun listSettingsClass(): Class = when(accountType) { TYPE_ETESYNC -> EteSyncCalendarSettingsActivity::class.java TYPE_LOCAL -> LocalListSettingsActivity::class.java diff --git a/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt index 2218d4101..b4a0ac513 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt @@ -19,6 +19,10 @@ class OpenTaskAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Too binding.userLayout.visibility = View.GONE binding.passwordLayout.visibility = View.GONE binding.urlLayout.visibility = View.GONE + + if (caldavAccount!!.isOpenTaskEteSync) { + binding.repeat.visibility = View.GONE + } } override val description: Int