From c076cc85f9344ab0e7cd18b6751ebb0ba8070b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=28=C2=B4=E2=8C=A3=60=CA=83=C6=AA=29?=
 <pt2121@users.noreply.github.com>
Date: Tue, 20 Aug 2019 10:56:28 -0700
Subject: [PATCH] For #4436: Dismiss onboarding before navigating away from
 home (#4801)

---
 .../java/org/mozilla/fenix/home/HomeFragment.kt  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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
index 07f1c608f..3be4291a1 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -518,12 +518,19 @@ class HomeFragment : Fragment(), AccountObserver {
         homeViewModel.motionLayoutProgress = homeLayout?.progress ?: 0F
     }
 
+    private fun hideOnboardingIfNeeded() {
+        if (!onboarding.userHasBeenOnboarded()) {
+            onboarding.finish()
+            emitModeChanges()
+        }
+    }
+
     private fun setupHomeMenu() {
         homeMenu = HomeMenu(requireContext()) {
             when (it) {
                 HomeMenu.Item.Settings -> {
                     invokePendingDeleteJobs()
-                    onboarding.finish()
+                    hideOnboardingIfNeeded()
                     nav(
                         R.id.homeFragment,
                         HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
@@ -531,7 +538,7 @@ class HomeFragment : Fragment(), AccountObserver {
                 }
                 HomeMenu.Item.Library -> {
                     invokePendingDeleteJobs()
-                    onboarding.finish()
+                    hideOnboardingIfNeeded()
                     nav(
                         R.id.homeFragment,
                         HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
@@ -539,10 +546,7 @@ class HomeFragment : Fragment(), AccountObserver {
                 }
                 HomeMenu.Item.Help -> {
                     invokePendingDeleteJobs()
-                    if (!onboarding.userHasBeenOnboarded()) {
-                        onboarding.finish()
-                        emitModeChanges()
-                    }
+                    hideOnboardingIfNeeded()
                     (activity as HomeActivity).openToBrowserAndLoad(
                         searchTermOrURL = SupportUtils.getSumoURLForTopic(
                             context!!,