[android] Implement Android-native Connection Assist UI (78f7257f) · Commits · Pier Angelo Vendrame / Tor Browser

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,5 @@ enum class BrowserDirection(@IdRes val fragmentId: Int) {
		FromTranslationsDialogFragment(R.id.translationsDialogFragment),
		FromDownloadLanguagesPreferenceFragment(R.id.downloadLanguagesPreferenceFragment),
		FromMenuDialogFragment(R.id.menuDialogFragment),
		FromTorConnectionAssistFragment(R.id.torConnectionAssistFragment),
		}

+10 −12

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ import org.mozilla.fenix.tabhistory.TabHistoryDialogFragment
		import org.mozilla.fenix.tabstray.TabsTrayFragment
		import org.mozilla.fenix.theme.DefaultThemeManager
		import org.mozilla.fenix.theme.ThemeManager
		import org.mozilla.fenix.tor.TorConnectionAssistFragmentDirections
		import org.mozilla.fenix.tor.TorEvents
		import org.mozilla.fenix.utils.Settings
		import java.lang.ref.WeakReference
		@@ -153,6 +154,7 @@ import java.util.Locale
		import androidx.navigation.fragment.findNavController
		import mozilla.components.browser.engine.gecko.GeckoEngine
		import mozilla.components.browser.state.selector.findCustomTab
		import org.mozilla.fenix.home.HomeFragment
		import org.mozilla.geckoview.TorIntegrationAndroid

		/**
		@@ -1252,8 +1254,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn
		// return
		// }

		if (settings().useNewBootstrap) {
		if (settings().useNewBootstrapNativeUi) {
		if (!settings().useHtmlConnectionUi) {
		navController.navigate(NavGraphDirections.actionStartupTorConnectionAssist())
		} else {
		navController.navigate(NavGraphDirections.actionStartupHome())
		@@ -1263,9 +1264,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn
		from = BrowserDirection.FromHome,
		)
		}
		} else {
		navController.navigate(NavGraphDirections.actionStartupTorbootstrap())
		}
		}

		final override fun attachBaseContext(base: Context) {

+1 −6

Original line number	Diff line number	Diff line
		@@ -1582,12 +1582,7 @@ abstract class BaseBrowserFragment :
		private fun handleBetaHtmlTorConnect() {
		val currentTab = getCurrentTab() ?: return
		if (currentTab.content.url == "about:torconnect") {
		if (!requireActivity().settings().useNewBootstrap) {
		requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)
		(requireActivity() as HomeActivity).navHost.navController.navigate(
		NavGraphDirections.actionStartupTorbootstrap(),
		)
		} else if (!requireActivity().settings().useNewBootstrapHtmlUi) {
		if (!requireActivity().settings().useHtmlConnectionUi) {
		requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)
		(requireActivity() as HomeActivity).navigateToHome(findNavController())
		} else {

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ class Components(private val context: Context) {

		val fxSuggest by lazyMonitored { FxSuggest(context) }

		val torController by lazyMonitored { if (settings.useNewBootstrap) TorControllerGV(context) else TorControllerTAS(context) }
		val torController by lazyMonitored { TorControllerGV(context) }
		}

		/**

+0 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,6 @@ class Core(
		emailTrackerBlockingPrivateBrowsing = false,
		torSecurityLevel = context.settings().torSecurityLevel().intRepresentation,
		spoofEnglish = context.settings().spoofEnglish,
		useNewBootstrap = context.settings().useNewBootstrap,
		)

		GeckoEngine(