From 68138bb26999adbe07186e34703d3d286a8b95d1 Mon Sep 17 00:00:00 2001 From: Priyonto M Rahman Date: Tue, 2 Jul 2024 22:35:53 +0200 Subject: [PATCH] fix: Set analytics consent to false by default #2022 --- .../RuuviStation/Sources/Classes/Routers/AppRouter.swift | 9 ++++++--- .../RuuviOnboard/Pages/RuuviOnboardSignInCell.swift | 6 ++---- .../RuuviOnboard/Pages/RuuviOnboardViewController.swift | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Apps/RuuviStation/Sources/Classes/Routers/AppRouter.swift b/Apps/RuuviStation/Sources/Classes/Routers/AppRouter.swift index ddde027e9..cfe8cb4a1 100644 --- a/Apps/RuuviStation/Sources/Classes/Routers/AppRouter.swift +++ b/Apps/RuuviStation/Sources/Classes/Routers/AppRouter.swift @@ -13,6 +13,8 @@ final class AppRouter { var settings: RuuviLocalSettings! var ruuviAnalytics: RuuviAnalytics! + private var analyticsConsentGiven: Bool = false + // navigation controller private var navigationController: UINavigationController { if let navigationController = weakNavigationController { @@ -127,15 +129,16 @@ extension AppRouter: OnboardRouterDelegate { _ router: OnboardRouter, consentGiven: Bool ) { - ruuviAnalytics.setConsent( - allowed: consentGiven - ) + analyticsConsentGiven = consentGiven } private func presentDashboard() { settings.welcomeShown = true settings.tosAccepted = true settings.analyticsConsentGiven = true + ruuviAnalytics.setConsent( + allowed: analyticsConsentGiven + ) AppUtility.lockOrientation(.all) let controller = dashboardViewController() navigationController.setNavigationBarHidden(false, animated: false) diff --git a/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardSignInCell.swift b/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardSignInCell.swift index 9878a1694..b9bdfdb41 100644 --- a/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardSignInCell.swift +++ b/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardSignInCell.swift @@ -206,13 +206,11 @@ private extension RuuviOnboardSignInCell { extension RuuviOnboardSignInCell { func configure( with viewModel: OnboardViewModel, - tosAccepted: Bool, - analyticsConsentGiven: Bool - ) { + tosAccepted: Bool) { titleLabel.text = viewModel.title subtitleLabel.text = viewModel.subtitle tosCheckbox.setChecked(tosAccepted) - analyticsCheckbox.setChecked(analyticsConsentGiven) + analyticsCheckbox.setChecked(false) setContinueButtonEnabled(tosAccepted) } } diff --git a/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardViewController.swift b/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardViewController.swift index 26ef34311..8bba69050 100644 --- a/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardViewController.swift +++ b/Modules/RuuviOnboard/Sources/RuuviOnboard/Pages/RuuviOnboardViewController.swift @@ -271,8 +271,7 @@ extension RuuviOnboardViewController { cell?.delegate = self cell?.configure( with: viewModel, - tosAccepted: tosAccepted, - analyticsConsentGiven: analyticsConsentGiven + tosAccepted: tosAccepted ) return cell }