Cleanup

Author: SailReal

presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt

@@ -161,22 +161,22 @@ class UnlockVaultPresenter @Inject constructor(
 		} else if (unverifiedVaultConfig.isPresent && unverifiedVaultConfig.get().keyLoadingStrategy() == KeyLoadingStrategy.HUB) {
 			val unverifiedHubVaultConfig = unverifiedVaultConfig.get() as UnverifiedHubVaultConfig
 			if (!isConsistentHubConfig(unverifiedHubVaultConfig)) {
-				Timber.tag("VaultListPresenter").e("Inconsistent hub config detected. Denying access to protect the user.")
+				Timber.tag("UnlockVaultPresenter").e("Inconsistent hub config detected. Denying access to protect the user.")
 				Toast.makeText(context(), R.string.error_hub_not_trustworthy, Toast.LENGTH_LONG).show()
 				finish()
 			} else if (configContainsAllowedHosts(unverifiedHubVaultConfig) && !isHttpHost(unverifiedHubVaultConfig)) {
 				allowedHubHosts(unverifiedHubVaultConfig, vault)
 			} else if (isCryptomatorCloud(unverifiedHubVaultConfig) && !isHttpHost(unverifiedHubVaultConfig)) {
 				allowedHubHosts(unverifiedHubVaultConfig, vault)
 			} else if (isCryptomatorCloud(unverifiedHubVaultConfig) && isHttpHost(unverifiedHubVaultConfig)) {
-				Timber.tag("VaultListPresenter").e("Cryptomator Cloud with http is not supported.")
+				Timber.tag("UnlockVaultPresenter").e("Cryptomator Cloud with http is not supported.")
 				Toast.makeText(context(), R.string.error_hub_not_trustworthy, Toast.LENGTH_LONG).show()
 				finish()
 			} else if (!isHttpHost(unverifiedHubVaultConfig)) {
 				val hostnames = setOf(unverifiedHubVaultConfig.apiBaseUrl.authority, unverifiedHubVaultConfig.authEndpoint.authority).toTypedArray()
 				view?.showDialog(HubCheckHostAuthenticityDialog.newInstance(hostnames, unverifiedHubVaultConfig, vault))
 			} else {
-				Timber.tag("VaultListPresenter").e("Cryptomator is not allowed to connect to " + unverifiedHubVaultConfig.apiBaseUrl.authority)
+				Timber.tag("UnlockVaultPresenter").e("Cryptomator is not allowed to connect to " + unverifiedHubVaultConfig.apiBaseUrl.authority)
 				Toast.makeText(context(), R.string.error_hub_not_trustworthy, Toast.LENGTH_LONG).show()
 				finish()
 			}
@@ -517,7 +517,7 @@ class UnlockVaultPresenter @Inject constructor(
 			}
 
 			override fun onError(e: Throwable) {
-				Timber.tag("VaultListPresenter").e(e, "Error while removing vault passwords")
+				Timber.tag("UnlockVaultPresenter").e(e, "Error while removing vault passwords")
 				finishWithResult(null)
 			}
 		})

presentation/src/main/res/values/strings.xml

@@ -251,6 +251,7 @@
 	<string name="screen_settings_live_search_summary">Update search results while entering the query</string>
 	<string name="screen_settings_glob_search">Search using glob pattern</string>
 	<string name="screen_settings_glob_search_summary">Use glob pattern matching like alice.*.jpg</string>
+	<string name="screen_hub_reset_unknown_hub_hosts_title">Reset Unknown Hub Hosts</string>
 
 	<string name="screen_settings_section_auto_lock">Automatic locking</string>
 	<string name="screen_settings_auto_lock_timeout">Lock after</string>
@@ -334,10 +335,6 @@
 	<string name="screen_cryptomator_variants_website_install" translatable="false">@string/screen_cryptomator_variants_lite_install</string>
 	<string name="screen_cryptomator_variants_installation_hint">Switching from or to the main F-Droid repository variant requires a fresh setup of the app.</string>
 
-	<!-- ## screen: hub -->
-	<string name="screen_hub_title" translatable="false">Hub</string>
-	<string name="screen_hub_clear_unknown_hub_hosts_title">Clear Unknown Hub Hosts</string>
-
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Cancel</string>
 

presentation/src/main/res/xml/preferences.xml

@@ -50,13 +50,9 @@
 			android:summary="@string/screen_settings_cryptomator_variants_summary"
 			android:title="@string/screen_settings_cryptomator_variants_label" />
 
-	</PreferenceCategory>
-
-	<PreferenceCategory android:title="@string/screen_hub_title">
-
 		<androidx.preference.PreferenceScreen
 			android:key="clearTrustedHubHosts"
-			android:title="@string/screen_hub_clear_unknown_hub_hosts_title" />
+			android:title="@string/screen_hub_reset_unknown_hub_hosts_title" />
 
 	</PreferenceCategory>