blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fix #4436: hide onboarding before navigating to settings (#4675) 

* Fix #4436: hide onboarding before navigating to settings

* No issue: Rename emitAccountChanges to emitModeChanges
master
(´⌣`ʃƪ) 2019-08-13 13:49:42 -07:00 committed by Colin Lee
parent d03c15d15c
commit 5aac05859d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -572,6 +572,10 @@ class HomeFragment : Fragment(), AccountObserver {
} }
HomeMenu.Item.Help -> { HomeMenu.Item.Help -> {
invokePendingDeleteJobs() invokePendingDeleteJobs()
if (!onboarding.userHasBeenOnboarded()) {
onboarding.finish()
emitModeChanges()
}
(activity as HomeActivity).openToBrowserAndLoad( (activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = SupportUtils.getSumoURLForTopic( searchTermOrURL = SupportUtils.getSumoURLForTopic(
context!!, context!!,
@ -728,7 +732,7 @@ class HomeFragment : Fragment(), AccountObserver {
Mode.fromBrowsingMode(browsingModeManager.mode) Mode.fromBrowsingMode(browsingModeManager.mode)
} }
private fun emitAccountChanges() { private fun emitModeChanges() {
context?.let { context?.let {
val mode = currentMode(it) val mode = currentMode(it)
getManagedEmitter<SessionControlChange>().onNext(SessionControlChange.ModeChange(mode)) getManagedEmitter<SessionControlChange>().onNext(SessionControlChange.ModeChange(mode))
@ -741,12 +745,12 @@ class HomeFragment : Fragment(), AccountObserver {
it.context.getString(R.string.onboarding_firefox_account_sync_is_on) it.context.getString(R.string.onboarding_firefox_account_sync_is_on)
).show() ).show()
} }
emitAccountChanges() emitModeChanges()
} }
override fun onAuthenticationProblems() = emitAccountChanges() override fun onAuthenticationProblems() = emitModeChanges()
override fun onLoggedOut() = emitAccountChanges() override fun onLoggedOut() = emitModeChanges()
override fun onProfileUpdated(profile: Profile) = emitAccountChanges() override fun onProfileUpdated(profile: Profile) = emitModeChanges()
private fun scrollAndAnimateCollection( private fun scrollAndAnimateCollection(
tabsAddedToCollectionSize: Int, tabsAddedToCollectionSize: Int,