CCPA flow fix: only make the CCPA request after the privacy policy has been viewed.

1Weather/ViewModels/TodayViewModel.swift

@@ -63,7 +63,10 @@ class TodayViewModel: ViewModelProtocol {
         }
         }
     }
     }
     
     
+    private var ccpaHelper = CCPAHelper.shared
+    
     public func privacyPolicyHasBeenViewed() {
     public func privacyPolicyHasBeenViewed() {
+        ccpaHelper.shownPrivacyNoticeBefore = true
         initializeAllAdsIfNeeded()
         initializeAllAdsIfNeeded()
     }
     }
     
     
@@ -74,14 +77,11 @@ class TodayViewModel: ViewModelProtocol {
                 self.delegate?.showOnboarding(viewModel: self)
                 self.delegate?.showOnboarding(viewModel: self)
             }
             }
             else {
             else {
-                let ccpaHelper = CCPAHelper.shared
-                if !ccpaHelper.shownPrivacyNoticeBefore {
-                    if ccpaHelper.policyHasBeenUpdated {
+                if !self.ccpaHelper.shownPrivacyNoticeBefore {
+                    if self.ccpaHelper.policyHasBeenUpdated {
                         analytics(log: .ANALYTICS_PRIVACY_POLICY_UPDATED)
                         analytics(log: .ANALYTICS_PRIVACY_POLICY_UPDATED)
                     }
                     }
-                    
                     self.delegate?.showPrivacyNotice(viewModel: self)
                     self.delegate?.showPrivacyNotice(viewModel: self)
-                    ccpaHelper.shownPrivacyNoticeBefore = true
                 }
                 }
                 else {
                 else {
                     self.initializeAllAdsIfNeeded()
                     self.initializeAllAdsIfNeeded()