Bug 1845232 - Adds action to clear private browsing

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -37,6 +37,7 @@ import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import org.mozilla.fenix.GleanMetrics.ReaderMode
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.TabCollectionStorage
@@ -96,17 +97,30 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
             )
         }
 
-        val homeAction = BrowserToolbar.Button(
+        val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
-            imageDrawable = AppCompatResources.getDrawable(
+        val leadingAction = if (isPrivate && context.settings().feltPrivateBrowsingEnabled) {
-                context,
+            BrowserToolbar.Button(
-                R.drawable.mozac_ic_home_24,
+                imageDrawable = AppCompatResources.getDrawable(
-            )!!,
+                    context,
-            contentDescription = context.getString(R.string.browser_toolbar_home),
+                    R.drawable.mozac_ic_data_clearance_24,
-            iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                )!!,
-            listener = browserToolbarInteractor::onHomeButtonClicked,
+                contentDescription = context.getString(R.string.browser_toolbar_erase),
-        )
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                listener = browserToolbarInteractor::onEraseButtonClicked,
+            )
+        } else {
+            BrowserToolbar.Button(
+                imageDrawable = AppCompatResources.getDrawable(
+                    context,
+                    R.drawable.mozac_ic_home_24,
+                )!!,
+                contentDescription = context.getString(R.string.browser_toolbar_home),
+                iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
+                listener = browserToolbarInteractor::onHomeButtonClicked,
+            )
+        }
 
-        browserToolbarView.view.addNavigationAction(homeAction)
+        browserToolbarView.view.addNavigationAction(leadingAction)
 
         updateToolbarActions(isTablet = resources.getBoolean(R.bool.tablet))
 

app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt

@@ -29,6 +29,7 @@ import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.home.HomeScreenViewModel
 
 /**
@@ -47,6 +48,11 @@ interface BrowserToolbarController {
      * @see [BrowserToolbarInteractor.onHomeButtonClicked]
      */
     fun handleHomeButtonClick()
+
+    /**
+     * @see [BrowserToolbarInteractor.onEraseButtonClicked]
+     */
+    fun handleEraseButtonClick()
 }
 
 @Suppress("LongParameterList")
@@ -180,6 +186,12 @@ class DefaultBrowserToolbarController(
         }
     }
 
+    override fun handleEraseButtonClick() {
+        homeViewModel.sessionToDelete = HomeFragment.ALL_PRIVATE_TABS
+        val directions = BrowserFragmentDirections.actionGlobalHome()
+        navController.navigate(directions)
+    }
+
     companion object {
         internal const val TELEMETRY_BROWSER_IDENTIFIER = "browserMenu"
     }

app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt

@@ -27,6 +27,11 @@ interface BrowserToolbarInteractor {
      * Navigates to the Home screen. Called when a user taps on the Home button.
      */
     fun onHomeButtonClicked()
+
+    /**
+     * Deletase all tabs and navigates to the Home screen. Called when a user taps on the erase button.
+     */
+    fun onEraseButtonClicked()
 }
 
 /**
@@ -77,4 +82,8 @@ class DefaultBrowserToolbarInteractor(
     override fun onHomeButtonClicked() {
         browserToolbarController.handleHomeButtonClick()
     }
+
+    override fun onEraseButtonClicked() {
+        browserToolbarController.handleEraseButtonClick()
+    }
 }

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -664,7 +664,11 @@ class HomeFragment : Fragment() {
         }
 
         val snackbarMessage = if (sessionCode == ALL_PRIVATE_TABS) {
-            getString(R.string.snackbar_private_tabs_closed)
+            if (requireContext().settings().feltPrivateBrowsingEnabled) {
+                getString(R.string.snackbar_private_data_deleted)
+            } else {
+                getString(R.string.snackbar_private_tabs_closed)
+            }
         } else {
             getString(R.string.snackbar_tabs_closed)
         }

app/src/main/res/values/strings.xml

@@ -214,7 +214,9 @@
     <!-- Browser Toolbar -->
     <!-- Content description for the Home screen button on the browser toolbar -->
     <string name="browser_toolbar_home">Home screen</string>
-
+    <!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
+         history and go back to the home screen. -->
+    <string name="browser_toolbar_erase">Erase browsing history</string>
     <!-- Locale Settings Fragment -->
     <!-- Content description for tick mark on selected language -->
     <string name="a11y_selected_locale_content_description">Selected language</string>
@@ -1273,6 +1275,8 @@
     <string name="snackbar_private_tab_closed">Private tab closed</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
     <string name="snackbar_private_tabs_closed">Private tabs closed</string>
+    <!-- Text shown in snackbar when user erases their private browsing data -->
+    <string name="snackbar_private_data_deleted">Private browsing data deleted</string>
     <!-- Text shown in snackbar to undo deleting a tab, top site or collection -->
     <string name="snackbar_deleted_undo">UNDO</string>
     <!-- Text shown in snackbar when user removes a top site -->

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt

@@ -53,6 +53,7 @@ import org.mozilla.fenix.browser.readermode.ReaderModeController
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.home.HomeScreenViewModel
 
 @RunWith(FenixRobolectricTestRunner::class)
@@ -366,6 +367,17 @@ class DefaultBrowserToolbarControllerTest {
         assertNotNull(Events.browserToolbarHomeTapped.testGetValue())
     }
 
+    @Test
+    fun handleEraseButtonClicked() {
+        val controller = createController()
+        controller.handleEraseButtonClick()
+
+        verify {
+            homeViewModel.sessionToDelete = HomeFragment.ALL_PRIVATE_TABS
+            navController.navigate(BrowserFragmentDirections.actionGlobalHome())
+        }
+    }
+
     private fun createController(
         activity: HomeActivity = this.activity,
         customTabSessionId: String? = null,

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt

@@ -80,4 +80,11 @@ class DefaultBrowserToolbarInteractorTest {
 
         verify { browserToolbarController.handleHomeButtonClick() }
     }
+
+    @Test
+    fun onEraseButtonClicked() {
+        interactor.onEraseButtonClicked()
+
+        verify { browserToolbarController.handleEraseButtonClick() }
+    }
 }