X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.kt;h=1895c6eb3e044fd698d8c617c82c743d31215c2d;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=d15f9aeef8eb4761e9bb07e54ae41d82b0bd4cf1;hpb=f3a2827543d388de53b27a124663c5f84af764c9;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt index d15f9aee..1895c6eb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 Soren Stoutner . + * Copyright 2017-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -57,6 +57,19 @@ import com.stoutner.privacybrowser.fragments.DomainsListFragment.DismissSnackbar import com.stoutner.privacybrowser.fragments.DomainsListFragment.SaveDomainSettingsInterface import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper +// Define the public constants. +const val CLOSE_ON_BACK = "close_on_back" +const val CURRENT_IP_ADDRESSES = "current_ip_addresses" +const val LOAD_DOMAIN = "load_domain" +const val SSL_END_DATE = "ssl_end_date" +const val SSL_ISSUED_BY_CNAME = "ssl_issued_by_cname" +const val SSL_ISSUED_BY_ONAME = "ssl_issued_by_oname" +const val SSL_ISSUED_BY_UNAME = "ssl_issued_by_uname" +const val SSL_ISSUED_TO_CNAME = "ssl_issued_to_cname" +const val SSL_ISSUED_TO_ONAME = "ssl_issued_to_oname" +const val SSL_ISSUED_TO_UNAME = "ssl_issued_to_uname" +const val SSL_START_DATE = "ssl_start_date" + // Define the class constants. private const val DOMAIN_SETTINGS_DATABASE_ID = "domain_settings_database_id" private const val DOMAIN_SETTINGS_DISPLAYED = "domain_settings_displayed" @@ -65,20 +78,6 @@ private const val LISTVIEW_POSITION = "listview_position" class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarInterface, SaveDomainSettingsInterface { companion object { - // Define the public constants. - const val CLOSE_ON_BACK = "close_on_back" - const val CURRENT_IP_ADDRESSES = "current_ip_addresses" - const val CURRENT_URL = "current_url" - const val LOAD_DOMAIN = "load_domain" - const val SSL_END_DATE = "ssl_end_date" - const val SSL_ISSUED_BY_CNAME = "ssl_issued_by_cname" - const val SSL_ISSUED_BY_ONAME = "ssl_issued_by_oname" - const val SSL_ISSUED_BY_UNAME = "ssl_issued_by_uname" - const val SSL_ISSUED_TO_CNAME = "ssl_issued_to_cname" - const val SSL_ISSUED_TO_ONAME = "ssl_issued_to_oname" - const val SSL_ISSUED_TO_UNAME = "ssl_issued_to_uname" - const val SSL_START_DATE = "ssl_start_date" - // Define the public variables. var currentDomainDatabaseId = 0 // Used in `DomainsListFragment`. var dismissingSnackbar = false // Used in `DomainsListFragment`. @@ -706,7 +705,6 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI val blockAllThirdPartyRequestsSwitch = view.findViewById(R.id.block_all_third_party_requests_switch) val userAgentSpinner = view.findViewById(R.id.user_agent_spinner) val customUserAgentEditText = view.findViewById(R.id.custom_user_agent_edittext) - val xRequestedWithHeaderSpinner = view.findViewById(R.id.x_requested_with_header_spinner) val fontSizeSpinner = view.findViewById(R.id.font_size_spinner) val customFontSizeEditText = view.findViewById(R.id.custom_font_size_edittext) val swipeToRefreshSpinner = view.findViewById(R.id.swipe_to_refresh_spinner) @@ -732,7 +730,6 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI val ultraPrivacy = ultraPrivacySwitch.isChecked val blockAllThirdPartyRequests = blockAllThirdPartyRequestsSwitch.isChecked val userAgentSwitchPosition = userAgentSpinner.selectedItemPosition - val xRequestedWithHeaderSwitchInt = xRequestedWithHeaderSpinner.selectedItemPosition val fontSizeSwitchPosition = fontSizeSpinner.selectedItemPosition val swipeToRefreshInt = swipeToRefreshSpinner.selectedItemPosition val webViewThemeInt = webViewThemeSpinner.selectedItemPosition @@ -743,8 +740,12 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI // Get the user agent name. val userAgentName: String = when (userAgentSwitchPosition) { - MainWebViewActivity.DOMAINS_SYSTEM_DEFAULT_USER_AGENT -> resources.getString(R.string.system_default_user_agent) // Set the user agent name to be `System default user agent`. - MainWebViewActivity.DOMAINS_CUSTOM_USER_AGENT -> customUserAgentEditText.text.toString() // Set the user agent name to be the custom user agent. + // Set the user agent name to be `System default user agent`. + DOMAINS_SYSTEM_DEFAULT_USER_AGENT -> resources.getString(R.string.system_default_user_agent) + + // Set the user agent name to be the custom user agent. + DOMAINS_CUSTOM_USER_AGENT -> customUserAgentEditText.text.toString() + else -> { // Get the array of user agent names. val userAgentNameArray = resources.getStringArray(R.array.user_agent_names) @@ -763,7 +764,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI // Save the domain settings. domainsDatabaseHelper.updateDomain(currentDomainDatabaseId, domainNameString, javaScript, cookies, domStorage, formData, easyList, easyPrivacy, fanboysAnnoyance, fanboysSocialBlocking, ultraList, - ultraPrivacy, blockAllThirdPartyRequests, userAgentName, xRequestedWithHeaderSwitchInt, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt, displayWebpageImagesInt, + ultraPrivacy, blockAllThirdPartyRequests, userAgentName, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt, displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress) // Update the pinned SSL certificate if a new one is checked.