[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Enable the connect assist experiments on alpha

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android


Commits:
47c80363 by clairehurst at 2024-01-22T12:30:48-07:00
fixup! Enable the connect assist experiments on alpha

- - - - -


1 changed file:

- fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt


Changes:

=====================================
fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
=====================================
@@ -1213,19 +1213,22 @@ abstract class BaseBrowserFragment :
     }
 
     private fun handleBetaHtmlTorConnect() {
-        if (getCurrentTab()?.content?.url == "about:torconnect") {
+        val currentTab = getCurrentTab() ?: return
+        if (currentTab.content.url == "about:torconnect") {
             if (!requireActivity().settings().useNewBootstrap) {
-                requireContext().components.useCases.tabsUseCases.removeAllTabs()
+                requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)
                 (requireActivity() as HomeActivity).navHost.navController.navigate(
                     NavGraphDirections.actionStartupTorbootstrap(),
                 )
             } else if (!requireActivity().settings().useNewBootstrapHtmlUi) {
-                requireContext().components.useCases.tabsUseCases.removeAllTabs()
+                requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)
                 (requireActivity() as HomeActivity).navigateToHome()
             } else {
                 // This just makes it not flash (be visible for a split second) before handleTabSelected() hides it again
                 browserToolbarView.view.visibility = View.GONE
             }
+        } else if (currentTab.content.url == "about:tor") {
+            requireContext().components.useCases.tabsUseCases.removeTab(currentTab.id)
         }
     }
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/47c80363d377c7c50b684bebb9c203db041fbd13

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/47c80363d377c7c50b684bebb9c203db041fbd13
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240123/bcc895d8/attachment-0001.htm>