From 5aac05859d713dff6f9d0b5a2eb9ff80429b85fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E2=8C=A3=60=CA=83=C6=AA=29?= Date: Tue, 13 Aug 2019 13:49:42 -0700 Subject: [PATCH] Fix #4436: hide onboarding before navigating to settings (#4675) * Fix #4436: hide onboarding before navigating to settings * No issue: Rename emitAccountChanges to emitModeChanges --- .../java/org/mozilla/fenix/home/HomeFragment.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 18c2ecc0e..5ee652188 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -572,6 +572,10 @@ class HomeFragment : Fragment(), AccountObserver { } HomeMenu.Item.Help -> { invokePendingDeleteJobs() + if (!onboarding.userHasBeenOnboarded()) { + onboarding.finish() + emitModeChanges() + } (activity as HomeActivity).openToBrowserAndLoad( searchTermOrURL = SupportUtils.getSumoURLForTopic( context!!, @@ -728,7 +732,7 @@ class HomeFragment : Fragment(), AccountObserver { Mode.fromBrowsingMode(browsingModeManager.mode) } - private fun emitAccountChanges() { + private fun emitModeChanges() { context?.let { val mode = currentMode(it) getManagedEmitter().onNext(SessionControlChange.ModeChange(mode)) @@ -741,12 +745,12 @@ class HomeFragment : Fragment(), AccountObserver { it.context.getString(R.string.onboarding_firefox_account_sync_is_on) ).show() } - emitAccountChanges() + emitModeChanges() } - override fun onAuthenticationProblems() = emitAccountChanges() - override fun onLoggedOut() = emitAccountChanges() - override fun onProfileUpdated(profile: Profile) = emitAccountChanges() + override fun onAuthenticationProblems() = emitModeChanges() + override fun onLoggedOut() = emitModeChanges() + override fun onProfileUpdated(profile: Profile) = emitModeChanges() private fun scrollAndAnimateCollection( tabsAddedToCollectionSize: Int,