[IB-1891] Save the preference value that the intro has been seen (#378)

* Cliqz: set the blocker settings to recommended settings

* Extract Blocker Setup into Static function

* Save the preference value that the intro has been seen

* Gate setupBlocking function because it wont compile in PAID

Author: Daniel Jilg

Client/Frontend/Browser/BrowserViewController.swift

@@ -2290,8 +2290,14 @@ extension BrowserViewController: IntroViewControllerDelegate {
     @discardableResult func presentIntroViewController(_ force: Bool = false, animated: Bool = true) -> Bool {
 		// Cliqz: Don't show onboarding for Cliqz for now
 		#if CLIQZ
+        // Setup Default Blocking Settings
+        CliqzIntroViewController.setupBlocking(blockOptionSelected: .recommended)
+
+        // Save the preference value that the intro has been seen
+        self.profile.prefs.setInt(1, forKey: PrefsKeys.IntroSeen)
 		return false
 		#endif
+        // End Cliqz
 
         //Cliqz: This is temporary. We should remove this once we have an Intro.        
         if let deeplink = self.profile.prefs.stringForKey("AdjustDeeplinkKey"), let url = URL(string: deeplink) {
@@ -2303,9 +2309,6 @@ extension BrowserViewController: IntroViewControllerDelegate {
 		#if PAID
 			let introViewController = LumenIntroViewController()
 		#else
-			/* Cliqz: Change to CliqzIntroViewController
-			let introViewController = IntroViewController()
-			*/
 			let introViewController = CliqzIntroViewController()
 		#endif
 

Cliqz/Intro/CliqzIntroViewController.swift

@@ -246,32 +246,41 @@ class CliqzIntroViewController: UIViewController {
 
         #if PAID
         #else
-        let populateOp = PopulateBlockedTrackersOperation()
+        CliqzIntroViewController.setupBlocking(blockOptionSelected: blockOptionSelected)
+        #endif
 
+        delegate?.introViewControllerDidFinish(self, requestToLogin: false)
+    }
+
+    #if PAID
+    #else
+    static func setupBlocking(blockOptionSelected: BlockOption) {
+        let populateOp = PopulateBlockedTrackersOperation()
+
         var loadOp: LoadTrackerListOperation? = nil
-        
+
         let loadOperations = GlobalPrivacyQueue.shared.operations.filter { (op) -> Bool in
             return op is LoadTrackerListOperation && !(op.isFinished || op.isCancelled)
         }
-        
+
         if !loadOperations.isEmpty, let loadOperation = loadOperations.first as? LoadTrackerListOperation {
             loadOp = loadOperation
         }
-        
+
         func addOp(operation: Operation) {
             if let loadOperation = loadOp {
                 operation.addDependency(loadOperation)
             }
-            
+
             populateOp.addDependency(operation)
-            
+
             GlobalPrivacyQueue.shared.addOperation(operation)
             GlobalPrivacyQueue.shared.addOperation(populateOp)
         }
-        
+
         if blockOptionSelected != .recommended {
             let blockOption: ChangeTrackersOperation.BlockOption =  blockOptionSelected == .all ? .blockAll : .unblockAll
-            
+
             let operation = ChangeTrackersOperation(blockOption: blockOption)
             addOp(operation: operation)
         }
@@ -281,11 +290,8 @@ class CliqzIntroViewController: UIViewController {
             UserDefaults.standard.set(true, forKey: trackersDefaultsAreAppliedKey)
             UserDefaults.standard.synchronize()
         }
-        
-        #endif
-        
-        delegate?.introViewControllerDidFinish(self, requestToLogin: false)
     }
+    #endif
 
     func login() {
         delegate?.introViewControllerDidFinish(self, requestToLogin: true)