Improve handling of welcome screen dismissal

joaomgcd · Dec 13, 2022 · e7292c7 · e7292c7
1 parent 4a3524d
commit e7292c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.../src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/OnboardingWelcomePage.kt b/.../src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/OnboardingWelcomePage.kt
@@ -70,7 +70,10 @@ fun OnboardingWelcomePage(
  viewModel.onShown(flow)
  }
 
- BackHandler { onBackPressed() }
+ BackHandler {
+ viewModel.onDismiss(flow, persistNewsletter = false)
+ onBackPressed()
+ }
 
  Content(
  isSignedInAsPlus = isSignedInAsPlus,
@@ -84,7 +87,7 @@ fun OnboardingWelcomePage(
  },
  state = state,
  onDone = {
- viewModel.onDone(flow)
+ viewModel.onDismiss(flow, persistNewsletter = true)
  onDone()
  },
  onNewsletterCheckedChanged = viewModel::updateNewsletter

diff --git a/.../main/java/au/com/shiftyjelly/pocketcasts/account/viewmodel/OnboardingWelcomeViewModel.kt b/.../main/java/au/com/shiftyjelly/pocketcasts/account/viewmodel/OnboardingWelcomeViewModel.kt
@@ -52,14 +52,16 @@ class OnboardingWelcomeViewModel @Inject constructor(
  persistNewsletterSelection()
  }
 
- fun onDone(flow: String) {
+ fun onDismiss(flow: String, persistNewsletter: Boolean) {
  analyticsTracker.track(
  AnalyticsEvent.WELCOME_DISMISSED,
  mapOf(
  AnalyticsProp.FLOW to flow
  )
  )
- persistNewsletterSelection()
+ if (persistNewsletter) {
+ persistNewsletterSelection()
+ }
  }
 
  fun onImportTapped(flow: String) {