From 5353009e922d5cebd2e9bebbfc13eac872846aab Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Wed, 1 Jun 2022 20:55:52 +0200 Subject: [PATCH] Simplify setting intents --- .../intent/BiometricAuthSettingsIntent.java | 9 --- .../presentation/intent/LicenseIntent.java | 9 --- .../presenter/SettingsPresenter.kt | 21 ------- .../ui/fragment/SettingsFragment.kt | 62 ++++--------------- 4 files changed, 12 insertions(+), 89 deletions(-) delete mode 100644 presentation/src/main/java/org/cryptomator/presentation/intent/BiometricAuthSettingsIntent.java delete mode 100644 presentation/src/main/java/org/cryptomator/presentation/intent/LicenseIntent.java diff --git a/presentation/src/main/java/org/cryptomator/presentation/intent/BiometricAuthSettingsIntent.java b/presentation/src/main/java/org/cryptomator/presentation/intent/BiometricAuthSettingsIntent.java deleted file mode 100644 index f3caedac..00000000 --- a/presentation/src/main/java/org/cryptomator/presentation/intent/BiometricAuthSettingsIntent.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.cryptomator.presentation.intent; - -import org.cryptomator.generator.Intent; -import org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity; - -@Intent(BiometricAuthSettingsActivity.class) -public interface BiometricAuthSettingsIntent { - -} diff --git a/presentation/src/main/java/org/cryptomator/presentation/intent/LicenseIntent.java b/presentation/src/main/java/org/cryptomator/presentation/intent/LicenseIntent.java deleted file mode 100644 index 295df876..00000000 --- a/presentation/src/main/java/org/cryptomator/presentation/intent/LicenseIntent.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.cryptomator.presentation.intent; - -import org.cryptomator.generator.Intent; -import org.cryptomator.presentation.ui.activity.LicensesActivity; - -@Intent(LicensesActivity.class) -public interface LicenseIntent { - -} diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt index f8c10768..17435262 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt @@ -19,7 +19,6 @@ import org.cryptomator.generator.Callback import org.cryptomator.presentation.BuildConfig import org.cryptomator.presentation.R import org.cryptomator.presentation.exception.ExceptionHandlers -import org.cryptomator.presentation.intent.Intents import org.cryptomator.presentation.logging.Logfiles import org.cryptomator.presentation.logging.ReleaseLogger import org.cryptomator.presentation.model.ProgressModel @@ -195,26 +194,6 @@ class SettingsPresenter @Inject internal constructor( }) } - fun onCloudSettingsClicked() { - startIntent(Intents.cloudSettingsIntent()) - } - - fun onBiometricAuthSettingsClicked() { - startIntent(Intents.biometricAuthSettingsIntent()) - } - - fun onCryptomatorVariantsClicked() { - startIntent(Intents.cryptomatorVariantsIntent()) - } - - fun onAutoUploadChooseVaultClicked() { - startIntent(Intents.autoUploadChooseVaultIntent()) - } - - fun onLicensedClicked() { - startIntent(Intents.licenseIntent()) - } - private inner class CreateErrorReportArchiveTask : AsyncTask() { override fun doInBackground(vararg params: Void?): File? { diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt index c08bdd5e..f4c0b537 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt @@ -1,5 +1,6 @@ package org.cryptomator.presentation.ui.fragment +import android.content.Intent import android.os.Bundle import android.text.SpannableString import android.text.style.ForegroundColorSpan @@ -15,6 +16,11 @@ import androidx.preference.SwitchPreferenceCompat import org.cryptomator.presentation.BuildConfig import org.cryptomator.presentation.R import org.cryptomator.presentation.service.PhotoContentJob +import org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity +import org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity +import org.cryptomator.presentation.ui.activity.CloudSettingsActivity +import org.cryptomator.presentation.ui.activity.CryptomatorVariantsActivity +import org.cryptomator.presentation.ui.activity.LicensesActivity import org.cryptomator.presentation.ui.activity.SettingsActivity import org.cryptomator.presentation.ui.dialog.DebugModeDisclaimerDialog import org.cryptomator.presentation.ui.dialog.DisableAppWhenObscuredDisclaimerDialog @@ -64,31 +70,6 @@ class SettingsFragment : PreferenceFragmentCompat() { true } - private val cloudSettingsClickListener = Preference.OnPreferenceClickListener { - onCloudSettingsClicked() - true - } - - private val biometricAuthSettingsClickListener = Preference.OnPreferenceClickListener { - onBiometricAuthSettingsClicked() - true - } - - private val cryptomatorVariantsClickListener = Preference.OnPreferenceClickListener { - onCryptomatorVariantsClicked() - true - } - - private val autoUploadChooseVaultClickListener = Preference.OnPreferenceClickListener { - onAutoUploadChooseVaultClicked() - true - } - - private val licensesClickListener = Preference.OnPreferenceClickListener { - onLicensedClicked() - true - } - private val useAutoPhotoUploadChangedListener = Preference.OnPreferenceChangeListener { _, newValue -> onUseAutoPhotoUploadChanged(TRUE == newValue) true @@ -243,13 +224,14 @@ class SettingsFragment : PreferenceFragmentCompat() { if (BuildConfig.FLAVOR == "apkstore") { (findPreference(UPDATE_CHECK_ITEM_KEY) as Preference?)?.onPreferenceClickListener = updateCheckClickListener } - (findPreference(SharedPreferencesHandler.CLOUD_SETTINGS) as Preference?)?.onPreferenceClickListener = cloudSettingsClickListener - (findPreference(SharedPreferencesHandler.BIOMETRIC_AUTHENTICATION) as Preference?)?.onPreferenceClickListener = biometricAuthSettingsClickListener + + (findPreference(SharedPreferencesHandler.CLOUD_SETTINGS) as Preference?)?.intent = Intent(context, CloudSettingsActivity::class.java) + (findPreference(SharedPreferencesHandler.BIOMETRIC_AUTHENTICATION) as Preference?)?.intent = Intent(context, BiometricAuthSettingsActivity::class.java) if (BuildConfig.FLAVOR != "playstore") { - (findPreference(SharedPreferencesHandler.CRYPTOMATOR_VARIANTS) as Preference?)?.onPreferenceClickListener = cryptomatorVariantsClickListener + (findPreference(SharedPreferencesHandler.CRYPTOMATOR_VARIANTS) as Preference?)?.intent = Intent(context, CryptomatorVariantsActivity::class.java) } - (findPreference(SharedPreferencesHandler.PHOTO_UPLOAD_VAULT) as Preference?)?.onPreferenceClickListener = autoUploadChooseVaultClickListener - (findPreference(SharedPreferencesHandler.LICENSES_ACTIVITY) as Preference?)?.onPreferenceClickListener = licensesClickListener + (findPreference(SharedPreferencesHandler.PHOTO_UPLOAD_VAULT) as Preference?)?.intent = Intent(context, AutoUploadChooseVaultActivity::class.java) + (findPreference(SharedPreferencesHandler.LICENSES_ACTIVITY) as Preference?)?.intent = Intent(context, LicensesActivity::class.java) } fun deactivateDebugMode() { @@ -275,26 +257,6 @@ class SettingsFragment : PreferenceFragmentCompat() { activity().presenter().onCheckUpdateClicked() } - private fun onCloudSettingsClicked() { - activity().presenter().onCloudSettingsClicked() - } - - private fun onBiometricAuthSettingsClicked() { - activity().presenter().onBiometricAuthSettingsClicked() - } - - private fun onCryptomatorVariantsClicked() { - activity().presenter().onCryptomatorVariantsClicked() - } - - private fun onAutoUploadChooseVaultClicked() { - activity().presenter().onAutoUploadChooseVaultClicked() - } - - private fun onLicensedClicked() { - activity().presenter().onLicensedClicked() - } - private fun onDebugModeChanged(enabled: Boolean) { if (enabled) { activity().showDialog(DebugModeDisclaimerDialog.newInstance())