X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.kt;h=ca9bfa3dc34ae24817d93973e15ae03fd60392eb;hb=7ab6a9027175e6a8f72b3f3683f8c4e05643d8bc;hp=949b678a90e06cd325072b97dc0618d02a8ed818;hpb=a156c3942ca31a1afca3271245cc2bda7ed5aed8;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 949b678a..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,10 +205,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
             addDomainDialog.show(supportFragmentManager, resources.getString(R.string.add_domain))
         }
 
-        // Get a handle for the activity.
-        val activity: Activity = this
-
-        // 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.
@@ -225,14 +222,14 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
                         undoDeleteSnackbar!!.dismiss()
                     } else {
                         // Go home.
-                        NavUtils.navigateUpFromSameTask(activity)
+                        finish()
                     }
                 } else if (closeOnBack) {  // Go directly back to the main WebView activity because the domains activity was launched from the options menu.
                     // Save the current domain settings.
                     saveDomainSettings(coordinatorLayout)
 
                     // Go home.
-                    NavUtils.navigateUpFromSameTask(activity)
+                    finish()
                 } else if (findViewById<View?>(R.id.domain_settings_scrollview) != null) {  // The device is in single-paned mode and domain settings fragment is displayed.
                     // Save the current domain settings.
                     saveDomainSettings(coordinatorLayout)
@@ -261,7 +258,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
                         undoDeleteSnackbar!!.dismiss()
                     } else {
                         // Go home.
-                        NavUtils.navigateUpFromSameTask(activity)
+                        finish()
                     }
                 }
             }
@@ -394,14 +391,14 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
                         undoDeleteSnackbar!!.dismiss()
                     } else {
                         // Go home.
-                        NavUtils.navigateUpFromSameTask(this)
+                        finish()
                     }
                 } else if (closeOnBack) {  // Go directly back to the main WebView activity because the domains activity was launched from the options menu.
                     // Save the current domain settings.
                     saveDomainSettings(coordinatorLayout)
 
                     // Go home.
-                    NavUtils.navigateUpFromSameTask(this)
+                    finish()
                 } else if (findViewById<View?>(R.id.domain_settings_scrollview) != null) {  // The device is in single-paned mode and the domain settings fragment is displayed.
                     // Save the current domain settings.
                     saveDomainSettings(coordinatorLayout)
@@ -430,7 +427,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
                         undoDeleteSnackbar!!.dismiss()
                     } else {
                         // Go home.
-                        NavUtils.navigateUpFromSameTask(this)
+                        finish()
                     }
                 }
             }
@@ -709,7 +706,6 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI
         val blockAllThirdPartyRequestsSwitch = view.findViewById<SwitchCompat>(R.id.block_all_third_party_requests_switch)
         val userAgentSpinner = view.findViewById<Spinner>(R.id.user_agent_spinner)
         val customUserAgentEditText = view.findViewById<EditText>(R.id.custom_user_agent_edittext)
-        val xRequestedWithHeaderSpinner = view.findViewById<Spinner>(R.id.x_requested_with_header_spinner)
         val fontSizeSpinner = view.findViewById<Spinner>(R.id.font_size_spinner)
         val customFontSizeEditText = view.findViewById<EditText>(R.id.custom_font_size_edittext)
         val swipeToRefreshSpinner = view.findViewById<Spinner>(R.id.swipe_to_refresh_spinner)
@@ -735,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
@@ -766,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.