subscription changes + fixed tab openning

added subscription expiration handling. fixed creating snapshot of webpage

@@ -36,6 +36,7 @@
 		194206C52B10D267000C1263 /* ProductList.plist in Resources */ = {isa = PBXBuildFile; fileRef = 194206C42B10D267000C1263 /* ProductList.plist */; };
 		194206C82B10DFC6000C1263 /* RemoveAdvertTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194206C72B10DFC6000C1263 /* RemoveAdvertTableViewCell.swift */; };
 		194635D62ADD738E00993D91 /* HistoryDataBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194635D52ADD738E00993D91 /* HistoryDataBase.swift */; };
+		1946D8792B178A9F00B5A735 /* SubscriptionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1946D8782B178A9F00B5A735 /* SubscriptionsModel.swift */; };
 		19696AF52AE80DBD00D1F8F9 /* blockerList.json in Resources */ = {isa = PBXBuildFile; fileRef = 19696AF42AE80DBD00D1F8F9 /* blockerList.json */; };
 		19696AF72AE80DBD00D1F8F9 /* ContentBlockerRequestHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19696AF62AE80DBD00D1F8F9 /* ContentBlockerRequestHandler.swift */; };
 		19696AFB2AE80DBD00D1F8F9 /* AdBlocker.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 19696AF22AE80DBC00D1F8F9 /* AdBlocker.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -44,7 +45,7 @@
 		1975347B2B109A37000818D3 /* SubscriptionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1975347A2B109A37000818D3 /* SubscriptionTableViewCell.swift */; };
 		197C2A242B0E3A7B0010B386 /* AdBlockButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A232B0E3A7B0010B386 /* AdBlockButton.swift */; };
 		197C2A282B0F65840010B386 /* OpenBrowserHomeTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A272B0F65830010B386 /* OpenBrowserHomeTransition.swift */; };
-		197C2A2D2B0F9EEB0010B386 /* StoreKitManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A2C2B0F9EEB0010B386 /* StoreKitManager.swift */; };
+		197C2A2D2B0F9EEB0010B386 /* SubscriptionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A2C2B0F9EEB0010B386 /* SubscriptionManager.swift */; };
 		197FC3EF2AC21E1F007F429C /* PayloadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197FC3EE2AC21E1F007F429C /* PayloadViewController.swift */; };
 		197FC3F22AC2AF9A007F429C /* AdvantagesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197FC3F12AC2AF9A007F429C /* AdvantagesTableViewCell.swift */; };
 		197FC3F42AC2BCD7007F429C /* SearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197FC3F32AC2BCD7007F429C /* SearchBarView.swift */; };
@@ -137,6 +138,7 @@
 		194206C42B10D267000C1263 /* ProductList.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = ProductList.plist; sourceTree = "<group>"; };
 		194206C72B10DFC6000C1263 /* RemoveAdvertTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveAdvertTableViewCell.swift; sourceTree = "<group>"; };
 		194635D52ADD738E00993D91 /* HistoryDataBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryDataBase.swift; sourceTree = "<group>"; };
+		1946D8782B178A9F00B5A735 /* SubscriptionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsModel.swift; sourceTree = "<group>"; };
 		19696AF22AE80DBC00D1F8F9 /* AdBlocker.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = AdBlocker.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		19696AF42AE80DBD00D1F8F9 /* blockerList.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = blockerList.json; sourceTree = "<group>"; };
 		19696AF62AE80DBD00D1F8F9 /* ContentBlockerRequestHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentBlockerRequestHandler.swift; sourceTree = "<group>"; };
@@ -146,7 +148,7 @@
 		1975347A2B109A37000818D3 /* SubscriptionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionTableViewCell.swift; sourceTree = "<group>"; };
 		197C2A232B0E3A7B0010B386 /* AdBlockButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBlockButton.swift; sourceTree = "<group>"; };
 		197C2A272B0F65830010B386 /* OpenBrowserHomeTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenBrowserHomeTransition.swift; sourceTree = "<group>"; };
-		197C2A2C2B0F9EEB0010B386 /* StoreKitManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreKitManager.swift; sourceTree = "<group>"; };
+		197C2A2C2B0F9EEB0010B386 /* SubscriptionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionManager.swift; sourceTree = "<group>"; };
 		197FC3EE2AC21E1F007F429C /* PayloadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayloadViewController.swift; sourceTree = "<group>"; };
 		197FC3F12AC2AF9A007F429C /* AdvantagesTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvantagesTableViewCell.swift; sourceTree = "<group>"; };
 		197FC3F32AC2BCD7007F429C /* SearchBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBarView.swift; sourceTree = "<group>"; };
@@ -238,7 +240,7 @@
 		190DB9FD2AC459CD000A7BF3 /* Managers */ = {
 			isa = PBXGroup;
 			children = (
-				197C2A2C2B0F9EEB0010B386 /* StoreKitManager.swift */,
+				197C2A2C2B0F9EEB0010B386 /* SubscriptionManager.swift */,
 				190DB9FF2AC45A3C000A7BF3 /* CachingManager.swift */,
 				193B3B892ACAF714002161ED /* TabManager.swift */,
 				1907D6962ADE766F00C40E9F /* HistoryDBManager.swift */,
@@ -634,6 +636,7 @@
 			children = (
 				19B739752AE276360073AA59 /* HistoryElement.swift */,
 				1926E82E2B03BED200FEBCFB /* HistoryToolbarMenuCases.swift */,
+				1946D8782B178A9F00B5A735 /* SubscriptionsModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -695,6 +698,12 @@
 		19F65A722ACBFD7300B50F61 /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				19B739742AE275FF0073AA59 /* Models */,
+				199DB1EC2AD3FCE1007E6A81 /* Services */,
+				190DB9FD2AC459CD000A7BF3 /* Managers */,
+				19F65A712ACBFCB500B50F61 /* Resources */,
+				193B3B812ACAF36C002161ED /* DataBases */,
+				190DBA012AC45CDA000A7BF3 /* Extentions */,
 				19F65A732ACBFDD100B50F61 /* Transitions */,
 			);
 			path = Common;
@@ -732,15 +741,9 @@
 		19FCBF202AC1727800F83A7F /* browser */ = {
 			isa = PBXGroup;
 			children = (
-				19B739742AE275FF0073AA59 /* Models */,
 				19FCBF382AC17A4800F83A7F /* Modules */,
-				199DB1EC2AD3FCE1007E6A81 /* Services */,
-				19F65A722ACBFD7300B50F61 /* Common */,
-				190DBA012AC45CDA000A7BF3 /* Extentions */,
-				193B3B812ACAF36C002161ED /* DataBases */,
-				19F65A712ACBFCB500B50F61 /* Resources */,
-				190DB9FD2AC459CD000A7BF3 /* Managers */,
 				19FCBF352AC1779800F83A7F /* Navigation */,
+				19F65A722ACBFD7300B50F61 /* Common */,
 				19FCBF212AC1727800F83A7F /* AppDelegate.swift */,
 				19FCBF2F2AC1727900F83A7F /* Info.plist */,
 				194206C42B10D267000C1263 /* ProductList.plist */,
@@ -948,7 +951,7 @@
 				197FC4032AC41EB7007F429C /* ToolbarView.swift in Sources */,
 				19B7396A2AE1554E0073AA59 /* URLConstants.swift in Sources */,
 				197534782B1096A7000818D3 /* SubscriptionView.swift in Sources */,
-				197C2A2D2B0F9EEB0010B386 /* StoreKitManager.swift in Sources */,
+				197C2A2D2B0F9EEB0010B386 /* SubscriptionManager.swift in Sources */,
 				19EECA472ACED48000094AFB /* SearchResultViewController.swift in Sources */,
 				191BB8572AC5B4AC00A2DEB9 /* OpenedTabsCollectionViewCell.swift in Sources */,
 				190DB9FC2AC450F6000A7BF3 /* RemoveAdvertViewController.swift in Sources */,
@@ -986,6 +989,7 @@
 				197FC3F92AC2FB69007F429C /* SettingViewController.swift in Sources */,
 				1984BF5A2AFB973C0050F816 /* TermsView.swift in Sources */,
 				197FC3FC2AC2FBA0007F429C /* SettingView.swift in Sources */,
+				1946D8792B178A9F00B5A735 /* SubscriptionsModel.swift in Sources */,
 				191BB8622AC6A01500A2DEB9 /* SearchingViewController.swift in Sources */,
 				1975347B2B109A37000818D3 /* SubscriptionTableViewCell.swift in Sources */,
 				197FC4012AC31D5C007F429C /* NavigationViewController.swift in Sources */,

@@ -9,7 +9,6 @@ import UIKit
         window = UIWindow(frame: screenRect)
         
         if let window = window {
-            let notification = NotificationManager()
             let navigationViewController = NavigationViewController()
             window.rootViewController = navigationViewController
             window.makeKeyAndVisible()

@@ -11,19 +11,30 @@ final class CachingManager {
     private enum Keys {
         static let isFirstAppLoad = "IsFirstAppLoad"
         static let isAdBlocking = "IsAdBlocking"
+        static let expirationDate = "ExpirationDate"
     }
     
-    private init() {}
-    
     static let shared = CachingManager()
     private let userDefaults = UserDefaults.standard
     
+    private init() {}
+    
     var isFirstAppLoad: Bool {
         get { return userDefaults.bool(forKey: Keys.isFirstAppLoad) }
         set { userDefaults.set(newValue, forKey: Keys.isFirstAppLoad) }
     }
-    var isAdBlocking: Bool {
+    var adBlockerState: Bool {
         get { return userDefaults.bool(forKey: Keys.isAdBlocking) }
         set { userDefaults.set(newValue, forKey: Keys.isAdBlocking) }
     }
+    var expirationDate: Double? {
+        get {
+            if userDefaults.object(forKey: Keys.expirationDate) == nil {
+                return nil
+            }
+            
+            return userDefaults.double(forKey: Keys.expirationDate)
+        }
+        set { userDefaults.set(newValue, forKey: Keys.expirationDate) }
+    }
 }

@@ -6,10 +6,20 @@
 //
 
 import Foundation
+import UIKit
 
 
 final class DateManager {
     static let shared = DateManager()
+
+    let currentDate = Date()
+    let currentTimestamp = Date().timeIntervalSince1970
+    
+    var dateFormatter: DateFormatter{
+        let obj = DateFormatter()
+        obj.dateFormat = "EEEE, d MMM"
+        return obj
+    }
     
     private init() {}
     
@@ -19,15 +29,20 @@ final class DateManager {
         return timeFormatter.string(from: date ?? Date())
     }
     
-    var dateFormatter: DateFormatter{
-        let obj = DateFormatter()
-        obj.dateFormat = "EEEE, d MMM"
-        return obj
-    }
-    
-    var currentDate: Date {
-        let obj = Date()
-        return obj
+    func getSubscriptionExpirationDate() {
+        guard CachingManager.shared.expirationDate != nil else {
+            Task {
+                if let activeSubscription = SubscriptionManager.shared.purchasedSubscriptions.first {
+                    switch await activeSubscription.latestTransaction {
+                    case .verified(let transaction):
+                        CachingManager.shared.expirationDate = transaction.expirationDate?.timeIntervalSince1970
+                    default:
+                        return
+                    }
+                }
+            }
+            return
+        }
     }
 }
 

@@ -12,31 +12,23 @@ fileprivate enum StoreError: Error {
     case failedVerification
 }
 
-final class StoreKitManager: ObservableObject {
-    @Published 
-    var storeProducts: [Product] = []
-    @Published 
-    var purchasedSubscriptions : [Product] = []
+final class SubscriptionManager: ObservableObject {
+    static let shared = SubscriptionManager()
     
-    private var updateListenerTask: Task<Void, Error>? = nil
+    @Published var storeProducts: [Product] = []
+    @Published var purchasedSubscriptions : [Product] = []
     
+    private var updateListenerTask: Task<Void, Error>? = nil
     private let productDict: [String : String]
     
     init() {
-        if let plistPath = Bundle.main.path(forResource: "ProductList", ofType: "plist"),
-           let plist = FileManager.default.contents(atPath: plistPath) {
-            productDict = (try? PropertyListSerialization.propertyList(from: plist, format: nil) as? [String : String]) ?? [:]
-        } else {
-            productDict = [:]
-        }
+        productDict = SubscriptionsModel.subscriptionInfo
         updateListenerTask = listenForTransactions()
         
         Task {
             await requestProducts()
             await updateCustomerProductStatus()
         }
-        
-        print("controller called")
     }
     
     deinit {
@@ -57,7 +49,6 @@ final class StoreKitManager: ObservableObject {
         }
     }
     
-    @MainActor
     func requestProducts() async {
         do {
             storeProducts = try await Product.products(for: productDict.values)
@@ -113,4 +104,8 @@ final class StoreKitManager: ObservableObject {
     func isPurchased(_ product: Product) async throws -> Bool {
         return purchasedSubscriptions.contains(product)
     }
+    
+    func restorePurchase() async throws {
+        try await AppStore.sync()
+    }
 }

+//
+//  SubscriptionsModel.swift
+//  Pro-Seecurity-VPN
+//
+//  Created by Artem Talko on 29.11.2023.
+//
+
+import Foundation
+
+struct SubscriptionsModel {
+    static var subscriptionInfo: [String: String] {
+        return ["adBlocker": "com.browser.adblocker"]
+    }
+}

@@ -21,15 +21,4 @@ final class SnapshotService {
         }
         return siteSnapshotImage
     }
-    
-    func makeWKWebViewSnapshot(_ wkWV: WKWebView?, completion: @escaping (UIImage?) -> Void) {
-        wkWV?.takeSnapshot(with: snapshotConfiguration) { (image, error) in
-            if let snaphotIMG = image {
-                completion(snaphotIMG)
-            } else if let error = error {
-                print(error)
-                completion(nil)
-            }
-        }
-    }
 }

@@ -24,6 +24,16 @@ final class HistoryViewController: UIViewController {
         }
     }
     
+    init() {
+        super.init(nibName: nil, bundle: nil)
+        
+        historyData = HistoryDBManager.shared.getHistoryDataForTableView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
@@ -52,16 +62,6 @@ final class HistoryViewController: UIViewController {
         navigationController?.isNavigationBarHidden = false
         navigationItem.title = "History"
     }
-    
-    init() {
-        super.init(nibName: nil, bundle: nil)
-        
-        historyData = HistoryDBManager.shared.getHistoryDataForTableView()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
 }
 
 //MARK: - TableView Extention

@@ -30,6 +30,21 @@ final class BrowserHomeViewController: UIViewController {
         }
     }
     
+    init(url: String?, currentTabId: Int?) {
+        searchResultViewController = SearchResultViewController(searchLink: String())
+        searchingViewController = SearchingViewController(dataForReq: [])
+        subscriptions = []
+        searchRequestURL = URLConstants.googleURL
+        
+        super.init(nibName: nil, bundle: nil)
+        self.url = url
+        self.currentTabId = currentTabId
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = ColorConstants.lightGray
@@ -58,21 +73,6 @@ final class BrowserHomeViewController: UIViewController {
         view = mainView
     }
     
-    init(url: String?, currentTabId: Int?) {
-        searchResultViewController = SearchResultViewController(searchLink: String())
-        searchingViewController = SearchingViewController(dataForReq: [])
-        subscriptions = []
-        searchRequestURL = URLConstants.googleURL
-        
-        super.init(nibName: nil, bundle: nil)
-        self.url = url
-        self.currentTabId = currentTabId
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         NotificationCenter.default.removeObserver(self)
@@ -189,8 +189,6 @@ extension BrowserHomeViewController {
         return (controllers.first(where: { $0 is TabsViewController }) as? TabsViewController)
     }
     
-    
-    
     private func didTabButtonTapped(type: ToolbarElementType) {
         switch type {
         case .history:

@@ -21,6 +21,7 @@ final class BrowserHomeView: GradientView {
         
         return obj
     }()
+    
     let settingButton: UIButton = {
         let obj = UIButton()
         obj.setImage(UIImage(named: "Settings")?.withTintColor(.systemBlue), for: .normal)

@@ -11,8 +11,19 @@ final class PayloadViewController: UIViewController {
     private let mainView = PayloadView()
     private let payloadTableViewData: [String]
     
+    init(){
+        payloadTableViewData = StringConstants.payloadViewControllerData
+        
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         initViewController()
     }
     
@@ -27,16 +38,6 @@ final class PayloadViewController: UIViewController {
         view = mainView
     }
     
-    init(){
-        payloadTableViewData = StringConstants.payloadViewControllerData
-        
-        super.init(nibName: nil, bundle: nil)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         

@@ -10,23 +10,14 @@ import UIKit
 final class RemoveAdvertViewController: UIViewController {
     private let mainView = RemoveAdvertView()
     
-    private let tableViewData = StringConstants.tableViewData
-    
-    var storeKit: StoreKitManager
+    private let notification: NotificationManager
+    private var storeKit: SubscriptionManager
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        initViewController()
-    }
+    private let tableViewData = StringConstants.tableViewData
     
-    private func initViewController() {
-        addTargets()
-        setupTableView()
-    }
-
     init() {
-        self.storeKit = StoreKitManager()
+        storeKit = SubscriptionManager()
+        notification = NotificationManager()
         
         super.init(nibName: nil, bundle: nil)
     }
@@ -35,16 +26,32 @@ final class RemoveAdvertViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        initViewController()
+    }
+    
     override func loadView() {
         view = mainView
     }
+    
+    private func initViewController() {
+        addTargets()
+        setupTableView()
+    }
 }
 
 //MARK: - Action
 extension RemoveAdvertViewController {
     @objc
     private func adBlockerButtonPressed(_ sender: UIButton) {
-        viewAdBlockingHandler()
+        if CachingManager.shared.adBlockerState {
+            turnOffAdBlocker()
+        } else {
+            subscriptionHandler()
+        }
+       
     }
     
     @objc
@@ -58,6 +65,50 @@ extension RemoveAdvertViewController {
 
 //MARK: Helpers
 extension RemoveAdvertViewController {
+    private func subscriptionHandler() {
+        if storeKit.purchasedSubscriptions.isEmpty {
+            Task {
+                try? await storeKit.restorePurchase()
+                
+                if storeKit.purchasedSubscriptions.isEmpty {
+                    presentSubscriptionHandler()
+                } else {
+                    if let restoreDate = CachingManager.shared.expirationDate {
+                        if Date().timeIntervalSince1970 < restoreDate {
+                            turnOnAdBlocker()
+                        } else {
+                            presentSubscriptionHandler()
+                        }
+                    } else {
+                        DateManager.shared.getSubscriptionExpirationDate()
+                        let restoreDate = CachingManager.shared.expirationDate
+                        if Date().timeIntervalSince1970 < restoreDate ?? 0 {
+                            turnOnAdBlocker()
+                        } else {
+                            presentSubscriptionHandler()
+                        }
+                    }
+                }
+            }
+        } else {
+            if let restoreDate = CachingManager.shared.expirationDate {
+                if Date().timeIntervalSince1970 < restoreDate {
+                    turnOnAdBlocker()
+                } else {
+                    presentSubscriptionHandler()
+                }
+            } else {
+                DateManager.shared.getSubscriptionExpirationDate()
+                let restoreDate = CachingManager.shared.expirationDate
+                if Date().timeIntervalSince1970 < restoreDate ?? 0 {
+                    turnOnAdBlocker()
+                } else {
+                    presentSubscriptionHandler()
+                }
+            }
+        }
+    }
+    
     private func addTargets() {
         mainView.adBlockButton.addTarget(self, action:  #selector(adBlockerButtonPressed(_ :)), for: .touchUpInside)
         
@@ -65,13 +116,19 @@ extension RemoveAdvertViewController {
     }
     
     private func presentSubscriptionHandler() {
-        if(storeKit.purchasedSubscriptions.isEmpty) {
-            let subcriptionViewController = SubscriptionViewController()
+            let subcriptionViewController = SubscriptionViewController(storeKit: storeKit, complition: testHandler)
             subcriptionViewController.modalPresentationStyle = .fullScreen
             subcriptionViewController.modalTransitionStyle = .crossDissolve
             
             present(subcriptionViewController, animated: true)
-        }
+    }
+    
+    private func testHandler() {
+        let alert = UIAlertController(title: "Congradulations!", message: "Success by subscription", preferredStyle: .alert)
+        let okAction = UIAlertAction(title: "OK", style: .default)
+        alert.addAction(okAction)
+        present(alert, animated: true)
+        turnOnAdBlocker()
     }
     
     private func setupTableView() {
@@ -79,33 +136,21 @@ extension RemoveAdvertViewController {
         mainView.adBlockTableView.delegate = self
         mainView.adBlockTableView.register(RemoveAdvertTableViewCell.self, forCellReuseIdentifier: RemoveAdvertTableViewCell.cellID)
     }
-
-    func successfullPurchaseHandler() {
-        self.mainView.adBlockButton.buttonImageView.image = .adBlockOnState
-        self.mainView.tapActionLabel.textColor = ColorConstants.SearchbarTintBlue
-        self.mainView.tapActionLabel.text = StringConstants.turnOff
+    
+    private func turnOnAdBlocker() {
+        mainView.adBlockButton.buttonImageView.image = .adBlockOnState
+        mainView.tapActionLabel.textColor = ColorConstants.SearchbarTintBlue
+        mainView.tapActionLabel.text = StringConstants.turnOff
         
-        CachingManager.shared.isAdBlocking = true
+        CachingManager.shared.adBlockerState = true
     }
     
-    func viewAdBlockingHandler() {
-        if CachingManager.shared.isAdBlocking {
-            mainView.adBlockButton.buttonImageView.image = .adBlockOffState
-            mainView.tapActionLabel.textColor = ColorConstants.customPink
-            mainView.tapActionLabel.text = StringConstants.turnOn
-            
-            CachingManager.shared.isAdBlocking = false
-        } else {
-            if !storeKit.purchasedSubscriptions.isEmpty {
-                mainView.adBlockButton.buttonImageView.image = .adBlockOnState
-                mainView.tapActionLabel.textColor = ColorConstants.SearchbarTintBlue
-                mainView.tapActionLabel.text = StringConstants.turnOff
-                
-                CachingManager.shared.isAdBlocking = true
-            } else {
-                presentSubscriptionHandler()
-            }
-        }
+    private func turnOffAdBlocker() {
+        mainView.adBlockButton.buttonImageView.image = .adBlockOffState
+        mainView.tapActionLabel.textColor = ColorConstants.customPink
+        mainView.tapActionLabel.text = StringConstants.turnOn
+        
+        CachingManager.shared.adBlockerState = false
     }
 }
 
@@ -121,7 +166,7 @@ extension RemoveAdvertViewController: UITableViewDelegate, UITableViewDataSource
             return UITableViewCell()
         }
         cell.advantagesCellLabel.text = tableViewData[indexPath.row]
-
+        
         return cell
     }
 }

@@ -10,7 +10,7 @@ import UIKit
 final class AdBlockButton: UIButton {
     var buttonImageView: UIImageView = {
         let obj = UIImageView()
-        let userDefaultsAdBlockingValue = CachingManager.shared.isAdBlocking
+        let userDefaultsAdBlockingValue = CachingManager.shared.adBlockerState
         
         if userDefaultsAdBlockingValue {
             obj.image = .adBlockOnState

@@ -53,11 +53,10 @@ final class RemoveAdvertView: GradientView {
     
     let tapActionLabel: UILabel = {
         let obj = UILabel()
-        let userDefaultsAdBlockerValue = CachingManager.shared.isAdBlocking
+        let userDefaultsAdBlockerValue = CachingManager.shared.adBlockerState
         
         obj.text = StringConstants.turnOn
         obj.font = FontConstants.semiboldFont_24
-        //ok
         if userDefaultsAdBlockerValue {
             obj.textColor = ColorConstants.SearchbarTintBlue
         } else {

@@ -45,6 +45,7 @@ final class SearchResultViewController: UIViewController {
     }
 }
 
+//MARK: URL handling
 extension SearchResultViewController {
     private func urlChecker(_ url: String) {
         let request = URLRequest(url: URL(string: url) ?? URL(fileURLWithPath: ""))
@@ -56,7 +57,7 @@ extension SearchResultViewController {
 //MARK: AdBlocker
 extension SearchResultViewController {
     private func setupAdBlocker() {
-        let userDefaultsAdblockKey = CachingManager.shared.isAdBlocking
+        let userDefaultsAdblockKey = CachingManager.shared.adBlockerState
         if userDefaultsAdblockKey {
             WKContentRuleListStore.default().getAvailableContentRuleListIdentifiers { res in
                 if let url = Bundle.main.url(forResource: "blockerList", withExtension: "json"),

@@ -28,12 +28,14 @@ final class SettingViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         view.backgroundColor = .white
         initViewController()
     }
     
     private func initViewController() {
         navigationController?.isNavigationBarHidden = false
+        
         setupSettingTableView()
         addTargets()
     }
@@ -104,7 +106,7 @@ extension SettingViewController {
             setupMessage()
         case 5:
             Task {
-                try? await AppStore.sync()
+                try? await SubscriptionManager.shared.restorePurchase()
             }
         default:
             break

@@ -10,19 +10,17 @@ import StoreKit
 
 
 final class SubscriptionViewController: UIViewController {
+    
     private let mainView = SubscriptionView()
     
     private let tableViewData: [String]
-
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        initViewController()
-    }
+    private let storeKitManager: SubscriptionManager
+    private let successCompletion: () -> Void
     
-    init() {
-        self.tableViewData = StringConstants.removeAdvertTableViewData
+    init(storeKit: SubscriptionManager, complition: @escaping() -> Void) {
+        tableViewData = StringConstants.removeAdvertTableViewData
+        storeKitManager = storeKit
+        successCompletion = complition
         
         super.init(nibName: nil, bundle: nil)
     }
@@ -31,6 +29,12 @@ final class SubscriptionViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        initViewController()
+    }
+    
     override func loadView() {
         view = mainView
     }
@@ -70,6 +74,17 @@ extension SubscriptionViewController {
         mainView.advantagesTableView.delegate = self
         mainView.advantagesTableView.register(SubscriptionTableViewCell.self, forCellReuseIdentifier: SubscriptionTableViewCell.cellID)
     }
+    
+    @MainActor
+    private func buySubscription() async throws {
+        if let adblockerProduct = storeKitManager.storeProducts.first(where: { $0.id == SubscriptionsModel.subscriptionInfo["adBlocker"]}) {
+            if let transaction = try await storeKitManager.purchase(adblockerProduct) {
+                CachingManager.shared.expirationDate = transaction.expirationDate?.timeIntervalSince1970 ?? 0
+                dismiss(animated: true)
+                successCompletion()
+            }
+        }
+    }
 }
 
 
@@ -82,29 +97,14 @@ extension SubscriptionViewController {
     
     @objc
     private func buyAdblocker(_ sender: UIButton) {
-        guard let navigationController = presentingViewController as? NavigationViewController else {
-            return
-        }
-        for viewController in navigationController.viewControllers {
-            guard let removeAdvertViewController = viewController as? RemoveAdvertViewController else {
-                return
-            }
-            Task {
-                do {
-                    if let adblockerProduct = removeAdvertViewController.storeKit.storeProducts.first(where: { $0.id == "com.browser.adblocker" }) {
-                        if (try await removeAdvertViewController.storeKit.purchase(adblockerProduct)) != nil {
-                            removeAdvertViewController.successfullPurchaseHandler()
-                            
-                            self.dismiss(animated: true)
-                        } else {
-                            print("Purchase cancelled or pending.")
-                        }
-                    } else {
-                        print("Adblocker product not found.")
-                    }
-                } catch {
-                    print("Failed to purchase Adblocker: \(error)")
-                }
+        Task {
+            do {
+               try await buySubscription()
+            } catch {
+                let alert = UIAlertController(title: "Fail!", message: "Error with subscription", preferredStyle: .alert)
+                let okAction = UIAlertAction(title: "OK", style: .default)
+                alert.addAction(okAction)
+                present(alert, animated: true)
             }
         }
     }

@@ -17,7 +17,7 @@ final class SubscriptionView: GradientView {
         return obj
     }()
     
-    let shieldView: UIImageView = {
+    private let shieldView: UIImageView = {
         let obj = UIImageView()
         obj.image = .shield
         obj.contentMode = .scaleAspectFit
@@ -96,15 +96,16 @@ final class SubscriptionView: GradientView {
         setup()
     }
     
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func layoutSubviews() {
         super.layoutSubviews()
         
         gradientLayer.frame = subscribeButton.bounds
     }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
+   
     
     private func setup() {
         addSubview(closeButton)

@@ -74,7 +74,6 @@ extension TabsViewController: UICollectionViewDataSource, UICollectionViewDelega
     
 }
 
-
 //MARK: - Action
 extension TabsViewController {
     private func didTabButtonTapped(type: HistoryToolbarElementType) {

@@ -16,7 +16,6 @@ final class NavigationViewController: UINavigationController {
     }
 
     private func initViewController() {
-        view.backgroundColor = .black
         delegate = self
         
         setStartControllers()
@@ -28,6 +27,7 @@ extension NavigationViewController {
     private func setStartControllers() {
         let payloadViewController = PayloadViewController()
         let removeAdvertViewController = RemoveAdvertViewController()
+        
         let cachingManager = CachingManager.shared
         
         if cachingManager.isFirstAppLoad == false {