AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Simplify setting intents

Browse Source
This commit is contained in:
Julian Raufelder 2022-06-01 20:55:52 +02:00
parent a95e5dca54
commit 5353009e92
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
4 changed files with 12 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
presentation/src/main/java/org/cryptomator/presentation/intent/BiometricAuthSettingsIntent.java
View File

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

9
presentation/src/main/java/org/cryptomator/presentation/intent/LicenseIntent.java
View File

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

21
presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt
View File

@ -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<Void?, IOException?, File?>() {
override fun doInBackground(vararg params: Void?): File? {

62
presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
View File

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