For #3275 - Invoke pending single session delete job on close all (#3438)

2019-06-13 10:58:45 -07:00 · 2019-06-13 10:58:45 -07:00 · 1f1320920f
parent 1212887e08
commit 1f1320920f
1 changed files with 10 additions and 1 deletions
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@ -365,7 +365,16 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
                }
            }
            is TabAction.CloseAll -> {
-                removeAllTabsWithUndo(action.private)
+                if (pendingSessionDeletion?.deletionJob == null) removeAllTabsWithUndo(action.private) else {
+                    pendingSessionDeletion?.deletionJob?.let {
+                        launch {
+                            it.invoke()
+                        }.invokeOnCompletion {
+                            pendingSessionDeletion = null
+                            removeAllTabsWithUndo(action.private)
+                        }
+                    }
+                }
            }
            is TabAction.PrivateBrowsingLearnMore -> {
                (activity as HomeActivity).openToBrowserAndLoad(