X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.kt;h=d15f9aeef8eb4761e9bb07e54ae41d82b0bd4cf1;hb=f3a2827543d388de53b27a124663c5f84af764c9;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..d15f9aee 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()
                     }
                 }
             }