X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.kt;h=ca9bfa3dc34ae24817d93973e15ae03fd60392eb;hb=96fd2b4338ea6dd9520605b2ef290e38ef044f1f;hp=2edab5528e915fef5231edebbf5bf880f6e50f58;hpb=9e11e18f4775c6bdd41f752f3baa290a0b50621d;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 2edab552..ca9bfa3d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt @@ -205,7 +205,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI addDomainDialog.show(supportFragmentManager, resources.getString(R.string.add_domain)) } - // Control what the navigation bar back button does. + // Control what the system back command does. val onBackPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { if (twoPanedMode) { // The device is in two-paned mode. @@ -706,7 +706,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 +731,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 @@ -763,7 +761,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.