fixup! [android] Implement Android-native Connection Assist UI

TB 43786: Add new UX flow for changing security level (Android)

mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt

@@ -76,12 +76,7 @@ class SearchUseCases(
             flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(),
             additionalHeaders: Map<String, String>? = null,
         ) {
-            var securityLevel: Int
-            try {
-                securityLevel = settings?.torSecurityLevel ?: 0
-            } catch (e: UnsupportedSettingException) {
-                securityLevel = 0
-            }
+            val securityLevel : Int = settings!!.torSecurityLevel
             val searchUrl = searchEngine?.let {
                 searchEngine.buildSearchUrl(searchTerms, securityLevel)
             } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel)
@@ -172,12 +167,7 @@ class SearchUseCases(
             flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(),
             additionalHeaders: Map<String, String>? = null,
         ) {
-            var securityLevel: Int
-            try {
-                securityLevel = settings?.torSecurityLevel ?: 0
-            } catch (e: UnsupportedSettingException) {
-                securityLevel = 0
-            }
+            val securityLevel : Int = settings!!.torSecurityLevel
             val searchUrl = searchEngine?.let {
                 searchEngine.buildSearchUrl(searchTerms, securityLevel)
             } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

@@ -1439,6 +1439,15 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn
         private const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L
     }
 
+    fun restartApplication() {
+        startActivity(
+            Intent(applicationContext, HomeActivity::class.java).addFlags(
+                Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK,
+            ),
+        )
+        shutDown()
+    }
+
     fun shutDown() : Nothing {
         finishAndRemoveTask()
         exitProcess(0)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt

@@ -343,7 +343,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
             if (screen.torBootstrapButton2ShouldOpenSettings) {
                 openTorConnectionSettings()
             } else if (screen.torBootstrapButton2ShouldRestartApp) {
-                restartApplication()
+                (requireActivity() as HomeActivity).restartApplication()
             } else {
                 torConnectionAssistViewModel.cancelTorBootstrap()
             }
@@ -404,15 +404,6 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
         openSettings(requireContext().getString(R.string.pref_key_connection))
     }
 
-    private fun restartApplication() {
-        startActivity(
-            Intent(requireContext(), HomeActivity::class.java).addFlags(
-                Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK,
-            ),
-        )
-        Runtime.getRuntime().exit(0)
-    }
-
     override fun onBackPressed(): Boolean {
         torConnectionAssistViewModel.handleBackButtonPressed(requireActivity() as HomeActivity)
         return true