diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cc2c02ee6..1d33e5bff 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -382,7 +382,7 @@ android:theme="@style/Tasks" /> EteSyncCalendarSettingsActivity::class.java TYPE_LOCAL -> LocalListSettingsActivity::class.java TYPE_OPENTASKS -> OpenTasksListSettingsActivity::class.java - TYPE_ETEBASE -> EteBaseCalendarSettingsActivity::class.java + TYPE_ETEBASE -> EtebaseCalendarSettingsActivity::class.java else -> CaldavCalendarSettingsActivity::class.java } diff --git a/app/src/main/java/org/tasks/etebase/AddEteBaseAccountViewModel.kt b/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt similarity index 75% rename from app/src/main/java/org/tasks/etebase/AddEteBaseAccountViewModel.kt rename to app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt index 80a785948..3b773523b 100644 --- a/app/src/main/java/org/tasks/etebase/AddEteBaseAccountViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/AddEtebaseAccountViewModel.kt @@ -3,8 +3,8 @@ package org.tasks.etebase import androidx.hilt.lifecycle.ViewModelInject import org.tasks.ui.CompletableViewModel -class AddEteBaseAccountViewModel @ViewModelInject constructor( - private val clientProvider: EteBaseClientProvider): CompletableViewModel() { +class AddEtebaseAccountViewModel @ViewModelInject constructor( + private val clientProvider: EtebaseClientProvider): CompletableViewModel() { suspend fun addAccount(url: String, username: String, password: String) { run { clientProvider diff --git a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt index d5048b6cb..3d164efd6 100644 --- a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt @@ -5,7 +5,7 @@ import org.tasks.data.CaldavAccount import org.tasks.ui.CompletableViewModel class CreateCalendarViewModel @ViewModelInject constructor( - private val clientProvider: EteBaseClientProvider) : CompletableViewModel() { + private val clientProvider: EtebaseClientProvider) : CompletableViewModel() { suspend fun createCalendar(account: CaldavAccount, name: String, color: Int) { run { clientProvider.forAccount(account).makeCollection(name, color) } } diff --git a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt index 681b4b8bd..c24b7b951 100644 --- a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt @@ -6,7 +6,7 @@ import org.tasks.data.CaldavCalendar import org.tasks.ui.ActionViewModel class DeleteCalendarViewModel @ViewModelInject constructor( - private val clientProvider: EteBaseClientProvider) : ActionViewModel() { + private val clientProvider: EtebaseClientProvider) : ActionViewModel() { suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) { run { clientProvider.forAccount(account).deleteCollection(calendar) } } diff --git a/app/src/main/java/org/tasks/etebase/EteBaseAccountSettingsActivity.kt b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt similarity index 94% rename from app/src/main/java/org/tasks/etebase/EteBaseAccountSettingsActivity.kt rename to app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt index fbc59998f..7fac2053a 100644 --- a/app/src/main/java/org/tasks/etebase/EteBaseAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt @@ -17,11 +17,11 @@ import org.tasks.data.CaldavAccount import javax.inject.Inject @AndroidEntryPoint -class EteBaseAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Toolbar.OnMenuItemClickListener { - @Inject lateinit var clientProvider: EteBaseClientProvider +class EtebaseAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Toolbar.OnMenuItemClickListener { + @Inject lateinit var clientProvider: EtebaseClientProvider - private val addAccountViewModel: AddEteBaseAccountViewModel by viewModels() - private val updateAccountViewModel: UpdateEteBaseAccountViewModel by viewModels() + private val addAccountViewModel: AddEtebaseAccountViewModel by viewModels() + private val updateAccountViewModel: UpdateEtebaseAccountViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/org/tasks/etebase/EteBaseCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt similarity index 95% rename from app/src/main/java/org/tasks/etebase/EteBaseCalendarSettingsActivity.kt rename to app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt index 6d7be65d3..1fa5b770b 100644 --- a/app/src/main/java/org/tasks/etebase/EteBaseCalendarSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt @@ -8,7 +8,7 @@ import org.tasks.data.CaldavAccount import org.tasks.data.CaldavCalendar @AndroidEntryPoint -class EteBaseCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() { +class EtebaseCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() { private val createCalendarViewModel: CreateCalendarViewModel by viewModels() private val deleteCalendarViewModel: DeleteCalendarViewModel by viewModels() private val updateCalendarViewModel: UpdateCalendarViewModel by viewModels() diff --git a/app/src/main/java/org/tasks/etebase/EteBaseClient.kt b/app/src/main/java/org/tasks/etebase/EtebaseClient.kt similarity index 99% rename from app/src/main/java/org/tasks/etebase/EteBaseClient.kt rename to app/src/main/java/org/tasks/etebase/EtebaseClient.kt index 133029425..b4f160cf8 100644 --- a/app/src/main/java/org/tasks/etebase/EteBaseClient.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseClient.kt @@ -15,7 +15,7 @@ import org.tasks.time.DateTimeUtils.currentTimeMillis import timber.log.Timber import java.io.IOException -class EteBaseClient( +class EtebaseClient( private val context: Context, private val username: String, private val etebase: Account, diff --git a/app/src/main/java/org/tasks/etebase/EteBaseClientProvider.kt b/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt similarity index 94% rename from app/src/main/java/org/tasks/etebase/EteBaseClientProvider.kt rename to app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt index 455236bc9..0cdc4b5ba 100644 --- a/app/src/main/java/org/tasks/etebase/EteBaseClientProvider.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.net.ssl.SSLContext -class EteBaseClientProvider @Inject constructor( +class EtebaseClientProvider @Inject constructor( @ApplicationContext private val context: Context, private val encryption: KeyStoreEncryption, private val preferences: Preferences, @@ -35,7 +35,7 @@ class EteBaseClientProvider @Inject constructor( private val caldavDao: CaldavDao ) { @Throws(NoSuchAlgorithmException::class, KeyManagementException::class) - suspend fun forAccount(account: CaldavAccount): EteBaseClient { + suspend fun forAccount(account: CaldavAccount): EtebaseClient { return forUrl( account.url!!, account.username!!, @@ -44,13 +44,13 @@ class EteBaseClientProvider @Inject constructor( } @Throws(KeyManagementException::class, NoSuchAlgorithmException::class) - suspend fun forUrl(url: String, username: String, password: String?, session: String? = null, foreground: Boolean = false): EteBaseClient = withContext(Dispatchers.IO) { + suspend fun forUrl(url: String, username: String, password: String?, session: String? = null, foreground: Boolean = false): EtebaseClient = withContext(Dispatchers.IO) { val httpClient = createHttpClient(foreground) val client = Client.create(httpClient, url) val etebase = session ?.let { Account.restore(client, it, null) } ?: Account.login(client, username, password!!) - EteBaseClient(context, username, etebase, caldavDao) + EtebaseClient(context, username, etebase, caldavDao) } private suspend fun createHttpClient(foreground: Boolean): OkHttpClient { diff --git a/app/src/main/java/org/tasks/etebase/EteBaseSynchronizer.kt b/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt similarity index 98% rename from app/src/main/java/org/tasks/etebase/EteBaseSynchronizer.kt rename to app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt index 07c49b119..618fd647d 100644 --- a/app/src/main/java/org/tasks/etebase/EteBaseSynchronizer.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt @@ -29,13 +29,13 @@ import java.security.NoSuchAlgorithmException import java.util.* import javax.inject.Inject -class EteBaseSynchronizer @Inject constructor( +class EtebaseSynchronizer @Inject constructor( @param:ApplicationContext private val context: Context, private val caldavDao: CaldavDao, private val localBroadcastManager: LocalBroadcastManager, private val taskDeleter: TaskDeleter, private val inventory: Inventory, - private val clientProvider: EteBaseClientProvider, + private val clientProvider: EtebaseClientProvider, private val iCal: iCalendar) { companion object { init { @@ -115,7 +115,7 @@ class EteBaseSynchronizer @Inject constructor( @Throws(IntegrityException::class, Exceptions.HttpException::class, VersionTooNewException::class) private suspend fun sync( - client: EteBaseClient, + client: EtebaseClient, caldavCalendar: CaldavCalendar, collection: Collection ) { diff --git a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt index a9664a00d..ba7668b3e 100644 --- a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt @@ -6,7 +6,7 @@ import org.tasks.data.CaldavCalendar import org.tasks.ui.CompletableViewModel class UpdateCalendarViewModel @ViewModelInject constructor( - private val clientProvider: EteBaseClientProvider): CompletableViewModel() { + private val clientProvider: EtebaseClientProvider): CompletableViewModel() { suspend fun updateCalendar(account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) { run { clientProvider.forAccount(account).updateCollection(calendar, name, color) } } diff --git a/app/src/main/java/org/tasks/etebase/UpdateEteBaseAccountViewModel.kt b/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt similarity index 82% rename from app/src/main/java/org/tasks/etebase/UpdateEteBaseAccountViewModel.kt rename to app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt index ea100f5d0..bf8d32c15 100644 --- a/app/src/main/java/org/tasks/etebase/UpdateEteBaseAccountViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/UpdateEtebaseAccountViewModel.kt @@ -4,8 +4,8 @@ import androidx.hilt.lifecycle.ViewModelInject import org.tasks.Strings.isNullOrEmpty import org.tasks.ui.CompletableViewModel -class UpdateEteBaseAccountViewModel @ViewModelInject constructor( - private val clientProvider: EteBaseClientProvider) : CompletableViewModel() { +class UpdateEtebaseAccountViewModel @ViewModelInject constructor( + private val clientProvider: EtebaseClientProvider) : CompletableViewModel() { suspend fun updateAccount(url: String, user: String, pass: String?, session: String) { run { if (isNullOrEmpty(pass)) { diff --git a/app/src/main/java/org/tasks/jobs/SyncEteBaseWork.kt b/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt similarity index 89% rename from app/src/main/java/org/tasks/jobs/SyncEteBaseWork.kt rename to app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt index 58ccfd5bf..945d7c899 100644 --- a/app/src/main/java/org/tasks/jobs/SyncEteBaseWork.kt +++ b/app/src/main/java/org/tasks/jobs/SyncEtebaseWork.kt @@ -10,17 +10,17 @@ import org.tasks.R import org.tasks.analytics.Firebase import org.tasks.data.CaldavAccount.Companion.TYPE_ETEBASE import org.tasks.data.CaldavDao -import org.tasks.etebase.EteBaseSynchronizer +import org.tasks.etebase.EtebaseSynchronizer import org.tasks.preferences.Preferences -class SyncEteBaseWork @WorkerInject constructor( +class SyncEtebaseWork @WorkerInject constructor( @Assisted context: Context, @Assisted workerParams: WorkerParameters, firebase: Firebase, localBroadcastManager: LocalBroadcastManager, preferences: Preferences, private val caldavDao: CaldavDao, - private val synchronizer: EteBaseSynchronizer + private val synchronizer: EtebaseSynchronizer ) : SyncWork(context, workerParams, firebase, localBroadcastManager, preferences) { override suspend fun enabled() = caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty() diff --git a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt index 2641ed738..3a948f611 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt @@ -105,7 +105,7 @@ class WorkManagerImpl constructor( sync(immediate, TAG_SYNC_ETESYNC, SyncEteSyncWork::class.java) override fun eteBaseSync(immediate: Boolean) = - sync(immediate, TAG_SYNC_ETEBASE, SyncEteBaseWork::class.java) + sync(immediate, TAG_SYNC_ETEBASE, SyncEtebaseWork::class.java) override fun openTaskSync(immediate: Boolean) = sync(immediate, TAG_SYNC_OPENTASK, SyncOpenTasksWork::class.java, false) @@ -177,7 +177,7 @@ class WorkManagerImpl constructor( throttle.run { scheduleBackgroundSync( TAG_BACKGROUND_SYNC_ETEBASE, - SyncEteBaseWork::class.java, + SyncEtebaseWork::class.java, enabled && caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty(), unmetered) } diff --git a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt index 6ade99730..da2297433 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt @@ -24,7 +24,7 @@ import org.tasks.data.GoogleTaskAccount import org.tasks.data.GoogleTaskListDao import org.tasks.data.OpenTaskDao.Companion.ACCOUNT_TYPE_DAVx5 import org.tasks.data.OpenTaskDao.Companion.ACCOUNT_TYPE_ETESYNC -import org.tasks.etebase.EteBaseAccountSettingsActivity +import org.tasks.etebase.EtebaseAccountSettingsActivity import org.tasks.etesync.EteSyncAccountSettingsActivity import org.tasks.injection.InjectingPreferenceFragment import org.tasks.jobs.WorkManager @@ -151,7 +151,7 @@ class Synchronization : InjectingPreferenceFragment() { preference.setSummary(when { account.isCaldavAccount -> R.string.caldav account.isEteSyncAccount -> R.string.etesync_v1 - account.isEteBaseAccount + account.isEtebaseAccount || (account.isOpenTasks && account.uuid?.startsWith(ACCOUNT_TYPE_ETESYNC) == true) -> R.string.etesync @@ -167,7 +167,7 @@ class Synchronization : InjectingPreferenceFragment() { val intent = Intent(context, when { account.isCaldavAccount -> CaldavAccountSettingsActivity::class.java account.isEteSyncAccount -> EteSyncAccountSettingsActivity::class.java - account.isEteBaseAccount -> EteBaseAccountSettingsActivity::class.java + account.isEtebaseAccount -> EtebaseAccountSettingsActivity::class.java account.isOpenTasks -> OpenTaskAccountSettingsActivity::class.java else -> throw IllegalArgumentException("Unexpected account type: $account") }) diff --git a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt index 716f926f4..84d878367 100644 --- a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt +++ b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt @@ -17,7 +17,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.caldav.CaldavAccountSettingsActivity import org.tasks.dialogs.DialogBuilder -import org.tasks.etebase.EteBaseAccountSettingsActivity +import org.tasks.etebase.EtebaseAccountSettingsActivity import org.tasks.preferences.fragments.Synchronization.Companion.REQUEST_CALDAV_SETTINGS import org.tasks.preferences.fragments.Synchronization.Companion.REQUEST_GOOGLE_TASKS import org.tasks.themes.DrawableUtil @@ -65,7 +65,7 @@ class AddAccountDialog : DialogFragment() { Intent(activity, CaldavAccountSettingsActivity::class.java), REQUEST_CALDAV_SETTINGS) 3 -> activity?.startActivityForResult( - Intent(activity, EteBaseAccountSettingsActivity::class.java), + Intent(activity, EtebaseAccountSettingsActivity::class.java), REQUEST_CALDAV_SETTINGS) } dialog.dismiss() diff --git a/app/src/main/java/org/tasks/sync/SyncAdapters.kt b/app/src/main/java/org/tasks/sync/SyncAdapters.kt index 533e863db..f62b0ce53 100644 --- a/app/src/main/java/org/tasks/sync/SyncAdapters.kt +++ b/app/src/main/java/org/tasks/sync/SyncAdapters.kt @@ -90,7 +90,7 @@ class SyncAdapters @Inject constructor( val googleTasksEnabled = async { isGoogleTaskSyncEnabled() } val caldavEnabled = async { isCaldavSyncEnabled() } val eteSyncEnabled = async { isEteSyncEnabled() } - val eteBaseEnabled = async { isEteBaseEnabled() } + val eteBaseEnabled = async { isEtebaseEnabled() } val opentasksEnabled = async { isOpenTaskSyncEnabled() } if (googleTasksEnabled.await()) { @@ -122,7 +122,7 @@ class SyncAdapters @Inject constructor( @Deprecated("use etebase") private suspend fun isEteSyncEnabled() = caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty() - private suspend fun isEteBaseEnabled() = caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty() + private suspend fun isEtebaseEnabled() = caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty() private suspend fun isOpenTaskSyncEnabled() = caldavDao.getAccounts(TYPE_OPENTASKS).isNotEmpty()