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

Update dependencies

Browse Source
This commit is contained in:
Julian Raufelder 2021-05-05 15:06:41 +02:00
parent 3381a12da4
commit 454bf9406e
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildsystem/dependencies.gradle
View File

@ -5,7 +5,7 @@ allprojects {
} }
ext { ext {
androidBuildToolsVersion = "29.0.2" androidBuildToolsVersion = "29.0.3"
androidMinSdkVersion = 23 androidMinSdkVersion = 23
androidTargetSdkVersion = 29 androidTargetSdkVersion = 29
androidCompileSdkVersion = 29 androidCompileSdkVersion = 29
@ -26,7 +26,7 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.35' daggerVersion = '2.35.1'
gsonVersion = '2.8.6' gsonVersion = '2.8.6'
@ -82,10 +82,10 @@ ext {
uiautomatorVersion = '2.2.0' uiautomatorVersion = '2.2.0'
androidxCoreVersion = '1.3.2' androidxCoreVersion = '1.3.2'
androidxFragmentVersion = '1.3.2' androidxFragmentVersion = '1.3.3'
androidxViewpagerVersion = '1.0.0' androidxViewpagerVersion = '1.0.0'
androidxSwiperefreshVersion = '1.1.0' androidxSwiperefreshVersion = '1.1.0'
androidxPreferenceVersion = '1.0.0' // 1.1.0 and 1.1.2 does have a bug with the text size androidxPreferenceVersion = '1.1.1'
androidxRecyclerViewVersion = '1.2.0' androidxRecyclerViewVersion = '1.2.0'
androidxDocumentfileVersion = '1.0.1' androidxDocumentfileVersion = '1.0.1'
androidxBiometricVersion = '1.1.0' androidxBiometricVersion = '1.1.0'

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

@ -105,7 +105,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
if (biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_SUCCESS if (biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_SUCCESS
&& biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) { && biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
val preference = findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) val preference = findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) as Preference?
val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory? val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?
generalCategory?.removePreference(preference) generalCategory?.removePreference(preference)
@ -116,7 +116,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
} }
private fun setupAppVersion() { private fun setupAppVersion() {
val preference = findPreference(APP_VERSION_ITEM_KEY) val preference = findPreference(APP_VERSION_ITEM_KEY) as Preference?
val versionName = SpannableString(BuildConfig.VERSION_NAME) val versionName = SpannableString(BuildConfig.VERSION_NAME)
versionName.setSpan( // versionName.setSpan( //
ForegroundColorSpan(ContextCompat.getColor(activity(), R.color.textColorLight)), // ForegroundColorSpan(ContextCompat.getColor(activity(), R.color.textColorLight)), //
@ -125,7 +125,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
} }
private fun setupLruCacheSize() { private fun setupLruCacheSize() {
val preference = findPreference(DISPLAY_LRU_CACHE_SIZE_ITEM_KEY) val preference = findPreference(DISPLAY_LRU_CACHE_SIZE_ITEM_KEY) as Preference?
val size = LruFileCacheUtil(requireContext()).totalSize() val size = LruFileCacheUtil(requireContext()).totalSize()
@ -152,11 +152,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
private fun setupLicense() { private fun setupLicense() {
when (BuildConfig.FLAVOR) { when (BuildConfig.FLAVOR) {
"apkstore" -> { "apkstore" -> {
findPreference(SharedPreferencesHandler.MAIL)?.title = format(getString(R.string.screen_settings_license_mail), sharedPreferencesHandler.mail()) (findPreference(SharedPreferencesHandler.MAIL) as Preference?)?.title = format(getString(R.string.screen_settings_license_mail), sharedPreferencesHandler.mail())
setupUpdateCheck() setupUpdateCheck()
} }
"fdroid" -> { "fdroid" -> {
findPreference(SharedPreferencesHandler.MAIL)?.title = format(getString(R.string.screen_settings_license_mail), sharedPreferencesHandler.mail()) (findPreference(SharedPreferencesHandler.MAIL) as Preference?)?.title = format(getString(R.string.screen_settings_license_mail), sharedPreferencesHandler.mail())
removeUpdateCheck() removeUpdateCheck()
} }
else -> { else -> {
@ -173,7 +173,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
} }
fun setupUpdateCheck() { fun setupUpdateCheck() {
val preference = findPreference(UPDATE_CHECK_ITEM_KEY) val preference = findPreference(UPDATE_CHECK_ITEM_KEY) as Preference?
val lastUpdateCheck = sharedPreferencesHandler.lastUpdateCheck() val lastUpdateCheck = sharedPreferencesHandler.lastUpdateCheck()
val readableDate: String = if (lastUpdateCheck != null) { val readableDate: String = if (lastUpdateCheck != null) {
@ -194,17 +194,17 @@ class SettingsFragment : PreferenceFragmentCompat() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
findPreference(SEND_ERROR_REPORT_ITEM_KEY)?.onPreferenceClickListener = sendErrorReportClickListener (findPreference(SEND_ERROR_REPORT_ITEM_KEY) as Preference?)?.onPreferenceClickListener = sendErrorReportClickListener
findPreference(LRU_CACHE_CLEAR_ITEM_KEY)?.onPreferenceClickListener = clearCacheClickListener (findPreference(LRU_CACHE_CLEAR_ITEM_KEY) as Preference?)?.onPreferenceClickListener = clearCacheClickListener
findPreference(SharedPreferencesHandler.DEBUG_MODE)?.onPreferenceChangeListener = debugModeChangedListener (findPreference(SharedPreferencesHandler.DEBUG_MODE) as Preference?)?.onPreferenceChangeListener = debugModeChangedListener
findPreference(SharedPreferencesHandler.DISABLE_APP_WHEN_OBSCURED)?.onPreferenceChangeListener = disableAppWhenObscuredChangedListener (findPreference(SharedPreferencesHandler.DISABLE_APP_WHEN_OBSCURED) as Preference?)?.onPreferenceChangeListener = disableAppWhenObscuredChangedListener
findPreference(SharedPreferencesHandler.SECURE_SCREEN)?.onPreferenceChangeListener = disableSecureScreenChangedListener (findPreference(SharedPreferencesHandler.SECURE_SCREEN) as Preference?)?.onPreferenceChangeListener = disableSecureScreenChangedListener
findPreference(SharedPreferencesHandler.SCREEN_STYLE_MODE)?.onPreferenceChangeListener = screenStyleModeChangedListener (findPreference(SharedPreferencesHandler.SCREEN_STYLE_MODE) as Preference?)?.onPreferenceChangeListener = screenStyleModeChangedListener
findPreference(SharedPreferencesHandler.PHOTO_UPLOAD)?.onPreferenceChangeListener = useAutoPhotoUploadChangedListener (findPreference(SharedPreferencesHandler.PHOTO_UPLOAD) as Preference?)?.onPreferenceChangeListener = useAutoPhotoUploadChangedListener
findPreference(SharedPreferencesHandler.USE_LRU_CACHE)?.onPreferenceChangeListener = useLruChangedListener (findPreference(SharedPreferencesHandler.USE_LRU_CACHE) as Preference?)?.onPreferenceChangeListener = useLruChangedListener
findPreference(SharedPreferencesHandler.LRU_CACHE_SIZE)?.onPreferenceChangeListener = useLruChangedListener (findPreference(SharedPreferencesHandler.LRU_CACHE_SIZE) as Preference?)?.onPreferenceChangeListener = useLruChangedListener
if (BuildConfig.FLAVOR == "apkstore") { if (BuildConfig.FLAVOR == "apkstore") {
findPreference(UPDATE_CHECK_ITEM_KEY)?.onPreferenceClickListener = updateCheckClickListener (findPreference(UPDATE_CHECK_ITEM_KEY) as Preference?)?.onPreferenceClickListener = updateCheckClickListener
} }
} }

48
presentation/src/main/res/xml/preferences.xml
View File

@ -6,7 +6,7 @@
android:key="license" android:key="license"
android:title="@string/screen_settings_license"> android:title="@string/screen_settings_license">
<Preference <androidx.preference.PreferenceScreen
android:enabled="false" android:enabled="false"
android:key="mail" /> android:key="mail" />
@ -16,16 +16,16 @@
android:key="@string/screen_settings_section_general" android:key="@string/screen_settings_section_general"
android:title="@string/screen_settings_section_general"> android:title="@string/screen_settings_section_general">
<Preference android:title="@string/screen_settings_cloud_settings_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_cloud_settings_label">
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.CloudSettingsActivity" android:targetClass="org.cryptomator.presentation.ui.activity.CloudSettingsActivity"
android:targetPackage="@string/app_id" /> android:targetPackage="@string/app_id" />
</Preference> </androidx.preference.PreferenceScreen>
<Preference <androidx.preference.PreferenceScreen
android:key="biometricAuthentication" android:key="biometricAuthentication"
android:title="@string/screen_settings_biometric_auth"> android:title="@string/screen_settings_biometric_auth">
@ -34,7 +34,7 @@
android:targetClass="org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity" android:targetClass="org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity"
android:targetPackage="@string/app_id" /> android:targetPackage="@string/app_id" />
</Preference> </androidx.preference.PreferenceScreen>
<androidx.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
@ -115,7 +115,7 @@
android:key="photoUploadIncludingVideos" android:key="photoUploadIncludingVideos"
android:title="@string/screen_settings_section_auto_photo_upload_including_videos" /> android:title="@string/screen_settings_section_auto_photo_upload_including_videos" />
<Preference <androidx.preference.PreferenceScreen
android:key="photoUploadVault" android:key="photoUploadVault"
android:title="@string/screen_settings_section_auto_photo_upload_vault"> android:title="@string/screen_settings_section_auto_photo_upload_vault">
@ -123,7 +123,7 @@
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity" android:targetClass="org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity"
android:targetPackage="@string/app_id" /> android:targetPackage="@string/app_id" />
</Preference> </androidx.preference.PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
@ -144,11 +144,11 @@
android:summary="%s" android:summary="%s"
android:title="@string/dialog_cache_size_title" /> android:title="@string/dialog_cache_size_title" />
<Preference <androidx.preference.PreferenceScreen
android:key="displayLruCacheSize" android:key="displayLruCacheSize"
android:title="@string/screen_settings_lru_cache_size" /> android:title="@string/screen_settings_lru_cache_size" />
<Preference <androidx.preference.PreferenceScreen
android:key="lruCacheClear" android:key="lruCacheClear"
android:title="@string/screen_settings_clear_lru_cache_size" /> android:title="@string/screen_settings_clear_lru_cache_size" />
@ -156,18 +156,18 @@
<PreferenceCategory android:title="@string/screen_settings_section_support"> <PreferenceCategory android:title="@string/screen_settings_section_support">
<Preference android:title="@string/screen_settings_contact_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_contact_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/screen_settings_support_uri" /> android:data="@string/screen_settings_support_uri" />
</Preference> </androidx.preference.PreferenceScreen>
<androidx.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="debugMode" android:key="debugMode"
android:title="@string/screen_settings_debug_mode_label" /> android:title="@string/screen_settings_debug_mode_label" />
<Preference <androidx.preference.PreferenceScreen
android:key="sendErrorReport" android:key="sendErrorReport"
android:title="@string/screen_settings_error_report_label" /> android:title="@string/screen_settings_error_report_label" />
@ -191,40 +191,40 @@
<PreferenceCategory android:title="@string/screen_settings_section_social"> <PreferenceCategory android:title="@string/screen_settings_section_social">
<Preference android:title="@string/screen_settings_website_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_website_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/screen_settings_website_uri" /> android:data="@string/screen_settings_website_uri" />
</Preference> </androidx.preference.PreferenceScreen>
<Preference android:title="@string/screen_settings_twitter_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_twitter_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/screen_settings_twitter_uri" /> android:data="@string/screen_settings_twitter_uri" />
</Preference> </androidx.preference.PreferenceScreen>
<Preference android:title="@string/screen_settings_facebook_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_facebook_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/screen_settings_facebook_uri" /> android:data="@string/screen_settings_facebook_uri" />
</Preference> </androidx.preference.PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/screen_settings_section_legal"> <PreferenceCategory android:title="@string/screen_settings_section_legal">
<Preference android:title="@string/screen_settings_licenses_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_licenses_label">
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.LicensesActivity" android:targetClass="org.cryptomator.presentation.ui.activity.LicensesActivity"
android:targetPackage="@string/app_id" /> android:targetPackage="@string/app_id" />
</Preference> </androidx.preference.PreferenceScreen>
<Preference android:title="@string/screen_settings_security_label"> <androidx.preference.PreferenceScreen android:title="@string/screen_settings_security_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:data="@string/screen_settings_security_url" /> android:data="@string/screen_settings_security_url" />
</Preference> </androidx.preference.PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
@ -232,7 +232,7 @@
android:key="versionCategory" android:key="versionCategory"
android:title="@string/screen_settings_section_version"> android:title="@string/screen_settings_section_version">
<Preference <androidx.preference.PreferenceScreen
android:enabled="false" android:enabled="false"
android:key="appVersion" android:key="appVersion"
android:title="@string/app_name" /> android:title="@string/app_name" />
@ -246,7 +246,7 @@
android:summary="%s" android:summary="%s"
android:title="@string/dialog_settings_update_check_interval_title" /> android:title="@string/dialog_settings_update_check_interval_title" />
<Preference <androidx.preference.PreferenceScreen
android:key="updateCheck" android:key="updateCheck"
android:title="@string/screen_settings_check_updates" /> android:title="@string/screen_settings_check_updates" />