For #2329 , For #2332: Invoke pending delete session job on navigate (#…

…2333)
mozilla-mobile · May 8, 2019 · eb4e159 · eb4e159
1 parent 1105f94
commit eb4e159
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -141,6 +141,7 @@ class HomeFragment : Fragment(), CoroutineScope {
             (toolbarPaddingDp * Resources.getSystem().displayMetrics.density).roundToInt()
         view.toolbar.compoundDrawablePadding = roundToInt
         view.toolbar.setOnClickListener {
+            invokePendingDeleteSessionJob()
             val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null)
             Navigation.findNavController(it).navigate(directions)
 
@@ -206,6 +207,7 @@ class HomeFragment : Fragment(), CoroutineScope {
                 showCollectionCreationFragment(action.selectedTabSessionId)
             }
             is TabAction.Select -> {
+                invokePendingDeleteSessionJob()
                 val session =
                     requireComponents.core.sessionManager.findSessionById(action.sessionId)
                 requireComponents.core.sessionManager.select(session!!)
@@ -241,6 +243,7 @@ class HomeFragment : Fragment(), CoroutineScope {
                 )
             }
             is TabAction.Add -> {
+                invokePendingDeleteSessionJob()
                 val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null)
                 Navigation.findNavController(view!!).navigate(directions)
             }
@@ -250,6 +253,16 @@ class HomeFragment : Fragment(), CoroutineScope {
         }
     }
 
+    private fun invokePendingDeleteSessionJob() {
+        deleteSessionJob?.let {
+            launch {
+                it.invoke()
+            }.invokeOnCompletion {
+                deleteSessionJob = null
+            }
+        }
+    }
+
     @Suppress("ComplexMethod")
     private fun handleCollectionAction(action: CollectionAction) {
         when (action) {
@@ -298,13 +311,20 @@ class HomeFragment : Fragment(), CoroutineScope {
     private fun setupHomeMenu() {
         homeMenu = HomeMenu(requireContext()) {
             when (it) {
-                HomeMenu.Item.Settings -> Navigation.findNavController(homeLayout).navigate(
-                    HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
-                )
-                HomeMenu.Item.Library -> Navigation.findNavController(homeLayout).navigate(
-                    HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
-                )
+                HomeMenu.Item.Settings -> {
+                    invokePendingDeleteSessionJob()
+                    Navigation.findNavController(homeLayout).navigate(
+                        HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
+                    )
+                }
+                HomeMenu.Item.Library -> {
+                    invokePendingDeleteSessionJob()
+                    Navigation.findNavController(homeLayout).navigate(
+                        HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
+                    )
+                }
                 HomeMenu.Item.Help -> {
+                    invokePendingDeleteSessionJob()
                     (activity as HomeActivity).openToBrowserAndLoad(
                         searchTermOrURL = SupportUtils.getSumoURLForTopic(
                             context!!,
@@ -367,7 +387,7 @@ class HomeFragment : Fragment(), CoroutineScope {
                     .map {
                         val selected =
                             it == sessionManager.selectedSession
-                        org.mozilla.fenix.home.sessioncontrol.Tab(
+                        Tab(
                             it.id,
                             it.url,
                             it.url.urlToTrimmedHost(),
@@ -408,7 +428,7 @@ class HomeFragment : Fragment(), CoroutineScope {
                     .filter { (activity as HomeActivity).browsingModeManager.isPrivate == it.private }
                     .map {
                         val selected = it == sessionManager.selectedSession
-                        org.mozilla.fenix.home.sessioncontrol.Tab(
+                        Tab(
                             it.id,
                             it.url,
                             it.url.urlToTrimmedHost(),