Refactor FXIOS-5607 [v111] Removed Deferred from TPStatsBlocklistChec…

…ker (#13055)
mozilla-mobile · Jan 30, 2023 · a71918e · a71918e
1 parent 95940a3
commit a71918e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/content-blocker-lib-ios/src/TabContentBlocker+ContentScript.swift b/content-blocker-lib-ios/src/TabContentBlocker+ContentScript.swift
@@ -30,7 +30,7 @@ extension TabContentBlocker {
             components.scheme = "http"
             guard let url = components.url else { return }
 
-            TPStatsBlocklistChecker.shared.isBlocked(url: url, mainDocumentURL: mainDocumentUrl).uponQueue(.main) { listItem in
+            TPStatsBlocklistChecker.shared.isBlocked(url: url, mainDocumentURL: mainDocumentUrl) { listItem in
                 if let listItem = listItem {
                     self.stats = self.stats.create(matchingBlocklist: listItem, host: url.host ?? "")
                 }

diff --git a/content-blocker-lib-ios/src/TrackingProtectionPageStats.swift b/content-blocker-lib-ios/src/TrackingProtectionPageStats.swift
@@ -35,34 +35,31 @@ class TPStatsBlocklistChecker {
     // Initialized async, is non-nil when ready to be used.
     private var blockLists: TPStatsBlocklists?
 
-    func isBlocked(url: URL, mainDocumentURL: URL) -> Deferred<BlocklistCategory?> {
-        let deferred = Deferred<BlocklistCategory?>()
-
+    func isBlocked(url: URL, mainDocumentURL: URL, completionHandler: @escaping (BlocklistCategory?) -> Void) {
         guard let blockLists = blockLists,
               let host = url.host,
               !host.isEmpty
         else {
             // TP Stats init isn't complete yet
-            deferred.fill(nil)
-            return deferred
+            completionHandler(nil)
+            return
         }
 
         guard let domain = url.baseDomain,
               let docDomain = mainDocumentURL.baseDomain,
               domain != docDomain
         else {
-            deferred.fill(nil)
-            return deferred
+            completionHandler(nil)
+            return
         }
 
         // Make a copy on the main thread
         let safelistRegex = ContentBlocker.shared.safelistedDomains.domainRegex
 
         DispatchQueue.global().async {
             // Return true in the Deferred if the domain could potentially be blocked
-            deferred.fill(blockLists.urlIsInList(url, mainDocumentURL: mainDocumentURL, safelistedDomains: safelistRegex))
+            completionHandler(blockLists.urlIsInList(url, mainDocumentURL: mainDocumentURL, safelistedDomains: safelistRegex))
         }
-        return deferred
     }
 
     func startup() {