Fixed Upgrade flow issues

ghostery · Apr 8, 2019 · 80ac563b9cbc5a746ceaf8f5784c5c3fbc39808d · 80ac563
1 parent 0f6b08b
commit 80ac563b9cbc5a746ceaf8f5784c5c3fbc39808d
Unified Split

Showing with 3 additions and 5 deletions.

+1 −3 Cliqz/Privacy/UI/ControlCenter/PaidControlCenter/PaidControlCenterViewController.swift

+2 −2 Cliqz/Upgrade&Payment/Cotroller/SubscriptionController.swift
diff --git a/Cliqz/Privacy/UI/ControlCenter/PaidControlCenter/PaidControlCenterViewController.swift b/Cliqz/Privacy/UI/ControlCenter/PaidControlCenter/PaidControlCenterViewController.swift
@@ -111,9 +111,7 @@ class PaidControlCenterViewController: ControlCenterViewController {
     }
 
     @objc func handlePurchaseSuccessNotification(_ notification: Notification) {
-        if !UserPreferences.instance.isProtectionOn {
-            self.privacyControl.setState(isOn: true)
-        }
+        self.privacyControl.setState(isOn: true)
         self.enableView()
     }
 

diff --git a/Cliqz/Upgrade&Payment/Cotroller/SubscriptionController.swift b/Cliqz/Upgrade&Payment/Cotroller/SubscriptionController.swift
@@ -160,8 +160,8 @@ public class SubscriptionController {
     public func hasSubscription(_ premiumType: PremiumType) -> Bool {
         let currentSubscription = getCurrentSubscription()
         switch currentSubscription {
-        case .premium(let premiumType, _):
-            return premiumType == premiumType
+        case .premium(let purchasedPremiumType, _):
+            return purchasedPremiumType == premiumType
         default:
             return false
         }