X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FDomainSettingsFragment.kt;h=a7fa53ff8e47c452c2cceb0021437eb8a132c687;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=fc9c2579d998947c5ac7416624bfa799226e23af;hpb=2bd8b7edef80b4b10cb809a198b4624c6c740c86;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt index fc9c2579..a7fa53ff 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 Soren Stoutner . + * Copyright 2017-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -50,8 +50,13 @@ import androidx.fragment.app.Fragment import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.activities.DOMAINS_CUSTOM_USER_AGENT +import com.stoutner.privacybrowser.activities.DOMAINS_SYSTEM_DEFAULT_USER_AGENT +import com.stoutner.privacybrowser.activities.DOMAINS_WEBVIEW_DEFAULT_USER_AGENT +import com.stoutner.privacybrowser.activities.SETTINGS_CUSTOM_USER_AGENT +import com.stoutner.privacybrowser.activities.SETTINGS_WEBVIEW_DEFAULT_USER_AGENT +import com.stoutner.privacybrowser.activities.UNRECOGNIZED_USER_AGENT import com.stoutner.privacybrowser.activities.DomainsActivity -import com.stoutner.privacybrowser.activities.MainWebViewActivity import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper import java.lang.IndexOutOfBoundsException @@ -134,6 +139,7 @@ class DomainSettingsFragment : Fragment() { val swipeToRefreshImageView = domainSettingsView.findViewById(R.id.swipe_to_refresh_imageview) val swipeToRefreshSpinner = domainSettingsView.findViewById(R.id.swipe_to_refresh_spinner) val swipeToRefreshTextView = domainSettingsView.findViewById(R.id.swipe_to_refresh_textview) + val webViewThemeLinearLayout = domainSettingsView.findViewById(R.id.webview_theme_linearlayout) val webViewThemeImageView = domainSettingsView.findViewById(R.id.webview_theme_imageview) val webViewThemeSpinner = domainSettingsView.findViewById(R.id.webview_theme_spinner) val webViewThemeTextView = domainSettingsView.findViewById(R.id.webview_theme_textview) @@ -179,12 +185,16 @@ class DomainSettingsFragment : Fragment() { val currentIpAddressesRadioButton = domainSettingsView.findViewById(R.id.current_ip_addresses_radiobutton) val currentIpAddressesTextView = domainSettingsView.findViewById(R.id.current_ip_addresses_textview) + // Hide the WebView theme linear layout if the API < 29. + if (Build.VERSION.SDK_INT < 29) + webViewThemeLinearLayout.visibility = View.GONE + // Setup the pinned labels. - val cNameLabel = getString(R.string.common_name) + " " - val oNameLabel = getString(R.string.organization) + " " - val uNameLabel = getString(R.string.organizational_unit) + " " - val startDateLabel = getString(R.string.start_date) + " " - val endDateLabel = getString(R.string.end_date) + " " + val cNameLabel = getString(R.string.common_name) + val oNameLabel = getString(R.string.organization) + val uNameLabel = getString(R.string.organizational_unit) + val startDateLabel = getString(R.string.start_date) + val endDateLabel = getString(R.string.end_date) // Initialize the database handler. val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext()) @@ -414,21 +424,21 @@ class DomainSettingsFragment : Fragment() { // Set the user agent according to the system default. when (defaultUserAgentArrayPosition) { // This is probably because it was set in an older version of Privacy Browser before the switch to persistent user agent names. - MainWebViewActivity.UNRECOGNIZED_USER_AGENT -> userAgentTextView.text = defaultUserAgentName + UNRECOGNIZED_USER_AGENT -> userAgentTextView.text = defaultUserAgentName // Display the WebView default user agent. - MainWebViewActivity.SETTINGS_WEBVIEW_DEFAULT_USER_AGENT -> userAgentTextView.text = webViewDefaultUserAgentString + SETTINGS_WEBVIEW_DEFAULT_USER_AGENT -> userAgentTextView.text = webViewDefaultUserAgentString // Display the custom user agent. - MainWebViewActivity.SETTINGS_CUSTOM_USER_AGENT -> userAgentTextView.text = defaultCustomUserAgentString + SETTINGS_CUSTOM_USER_AGENT -> userAgentTextView.text = defaultCustomUserAgentString // Get the user agent string from the user agent data array. else -> userAgentTextView.text = userAgentDataArray[defaultUserAgentArrayPosition] } - } else if (userAgentArrayPosition == MainWebViewActivity.UNRECOGNIZED_USER_AGENT || currentUserAgentName == getString(R.string.custom_user_agent)) { + } else if (userAgentArrayPosition == UNRECOGNIZED_USER_AGENT || currentUserAgentName == getString(R.string.custom_user_agent)) { // A custom user agent is stored in the current user agent name. The second check is necessary in case the user did not change the default custom text. // Set the user agent spinner to `Custom user agent`. - userAgentSpinner.setSelection(MainWebViewActivity.DOMAINS_CUSTOM_USER_AGENT) + userAgentSpinner.setSelection(DOMAINS_CUSTOM_USER_AGENT) // Hide the user agent text view. userAgentTextView.visibility = View.GONE @@ -447,7 +457,7 @@ class DomainSettingsFragment : Fragment() { customUserAgentEditText.visibility = View.GONE // Set the user agent text. - if (userAgentArrayPosition == MainWebViewActivity.DOMAINS_WEBVIEW_DEFAULT_USER_AGENT) { // The WebView default user agent is selected. + if (userAgentArrayPosition == DOMAINS_WEBVIEW_DEFAULT_USER_AGENT) { // The WebView default user agent is selected. // Display the WebView default user agent. userAgentTextView.text = webViewDefaultUserAgentString } else { // A user agent besides the default is selected. @@ -953,7 +963,7 @@ class DomainSettingsFragment : Fragment() { override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { // Set the new user agent. when (position) { - MainWebViewActivity.DOMAINS_SYSTEM_DEFAULT_USER_AGENT -> { + DOMAINS_SYSTEM_DEFAULT_USER_AGENT -> { // Show the user agent text view. userAgentTextView.visibility = View.VISIBLE @@ -963,20 +973,20 @@ class DomainSettingsFragment : Fragment() { // Set the user text. when (defaultUserAgentArrayPosition) { // This is probably because it was set in an older version of Privacy Browser before the switch to persistent user agent names. - MainWebViewActivity.UNRECOGNIZED_USER_AGENT -> userAgentTextView.text = defaultUserAgentName + UNRECOGNIZED_USER_AGENT -> userAgentTextView.text = defaultUserAgentName // Display the `WebView` default user agent. - MainWebViewActivity.SETTINGS_WEBVIEW_DEFAULT_USER_AGENT -> userAgentTextView.text = webViewDefaultUserAgentString + SETTINGS_WEBVIEW_DEFAULT_USER_AGENT -> userAgentTextView.text = webViewDefaultUserAgentString // Display the custom user agent. - MainWebViewActivity.SETTINGS_CUSTOM_USER_AGENT -> userAgentTextView.text = defaultCustomUserAgentString + SETTINGS_CUSTOM_USER_AGENT -> userAgentTextView.text = defaultCustomUserAgentString // Get the user agent string from the user agent data array. else -> userAgentTextView.text = userAgentDataArray[defaultUserAgentArrayPosition] } } - MainWebViewActivity.DOMAINS_WEBVIEW_DEFAULT_USER_AGENT -> { + DOMAINS_WEBVIEW_DEFAULT_USER_AGENT -> { // Show the user agent text view. userAgentTextView.visibility = View.VISIBLE @@ -987,7 +997,7 @@ class DomainSettingsFragment : Fragment() { customUserAgentEditText.visibility = View.GONE } - MainWebViewActivity.DOMAINS_CUSTOM_USER_AGENT -> { + DOMAINS_CUSTOM_USER_AGENT -> { // Hide the user agent TextView. userAgentTextView.visibility = View.GONE