From a5e3c1ab7390d2c02b2d6034cb8eb6588240e918 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Thu, 1 Sep 2022 00:59:00 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/26754 - Avoid showing CFR if the MR onboarding is being displayed --- .../home/sessioncontrol/SessionControlView.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt index e8801150f..067a53f1c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt @@ -217,14 +217,16 @@ class SessionControlView( override fun onLayoutCompleted(state: RecyclerView.State?) { super.onLayoutCompleted(state) - JumpBackInCFRDialog(view).showIfNeeded() - - if (context.settings().showSyncCFR) { - SyncCFRPresenter( - context = context, - recyclerView = view, - ).showSyncCFR() - context.settings().showSyncCFR = false + if (!context.settings().showHomeOnboardingDialog) { + JumpBackInCFRDialog(view).showIfNeeded() + + if (context.settings().showSyncCFR) { + SyncCFRPresenter( + context = context, + recyclerView = view, + ).showSyncCFR() + context.settings().showSyncCFR = false + } } // We want some parts of the home screen UI to be rendered first if they are