From 2040af6a5d20073c2f2f9b2b00e11696c6597b2f Mon Sep 17 00:00:00 2001
From: "codrut.topliceanu" <codrut.topliceanu@softvision.ro>
Date: Fri, 16 Jul 2021 19:08:20 +0300
Subject: [PATCH] For #20367 - Fixes removeAllTabs adding to recently closed

 `removeAllTabs` will now no longer allow `UndoMiddleware` from recovering the tabs.
---
 .../settings/deletebrowsingdata/DeleteBrowsingDataController.kt | 2 +-
 .../DefaultDeleteBrowsingDataControllerTest.kt                  | 2 +-
 .../fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt      | 2 +-
 .../org/mozilla/fenix/tabstray/CloseOnLastTabBindingTest.kt     | 2 +-
 .../java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
index 6d28fe7d31..c44bb6a2af 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt
@@ -39,7 +39,7 @@ class DefaultDeleteBrowsingDataController(
 
     override suspend fun deleteTabs() {
         withContext(coroutineContext) {
-            removeAllTabs.invoke()
+            removeAllTabs.invoke(false)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
index a7354c4750..139137e845 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt
@@ -71,7 +71,7 @@ class DefaultDeleteBrowsingDataControllerTest {
         controller.deleteTabs()
 
         verify {
-            removeAllTabs.invoke()
+            removeAllTabs.invoke(false)
         }
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
index 47a76456a6..25370de6a1 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
@@ -75,7 +75,7 @@ class DeleteAndQuitTest {
 
         verifyOrder {
             snackbar.show()
-            removeAllTabsUseCases.invoke()
+            removeAllTabsUseCases.invoke(false)
             activity.finishAndRemoveTask()
         }
 
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/CloseOnLastTabBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/CloseOnLastTabBindingTest.kt
index 99d17ac818..46cd30a21d 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/CloseOnLastTabBindingTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/CloseOnLastTabBindingTest.kt
@@ -106,7 +106,7 @@ class CloseOnLastTabBindingTest {
 
         binding.start()
 
-        browserStore.dispatch(TabListAction.RemoveAllTabsAction)
+        browserStore.dispatch(TabListAction.RemoveAllTabsAction())
 
         browserStore.waitUntilIdle()
 
diff --git a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
index aac2910e72..fe9c8b5978 100644
--- a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
@@ -135,7 +135,7 @@ class TelemetryMiddlewareTest {
         assertEquals(2, settings.openTabsCount)
         verify(exactly = 1) { metrics.track(Event.HaveOpenTabs) }
 
-        store.dispatch(TabListAction.RemoveAllTabsAction).joinBlocking()
+        store.dispatch(TabListAction.RemoveAllTabsAction()).joinBlocking()
         assertEquals(0, settings.openTabsCount)
         verify(exactly = 1) { metrics.track(Event.HaveNoOpenTabs) }
     }