Fix #3113: Fetch adblock data every 6 hours.

brave · Dec 9, 2020 · 74a0bd6 · 74a0bd6
1 parent dd49e30
commit 74a0bd6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/Client/Application/Delegates/AppDelegate.swift b/Client/Application/Delegates/AppDelegate.swift
@@ -478,6 +478,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
         if let authInfo = KeychainWrapper.sharedAppContainerKeychain.authenticationInfo(), authInfo.isPasscodeRequiredImmediately {
             authenticator?.willEnterForeground()
         }
+
+        AdblockResourceDownloader.shared.startLoading()
     }
 
     func applicationWillResignActive(_ application: UIApplication) {

diff --git a/Client/Frontend/Settings/AdblockDebugMenuTableViewController.swift b/Client/Frontend/Settings/AdblockDebugMenuTableViewController.swift
@@ -22,6 +22,7 @@ class AdblockDebugMenuTableViewController: TableViewController {
             if listNames.isEmpty { return }
 
             self.dataSource.sections = [self.actionsSection,
+                                        self.fetchSection,
                                         self.datesSection,
                                         self.bundledListsSection(names: listNames),
                                         self.downloadedListsSection(names: listNames)]
@@ -44,6 +45,19 @@ class AdblockDebugMenuTableViewController: TableViewController {
         return section
     }
 
+    private var fetchSection: Section {
+        var section = Section(footer: "Last time we pinged the server for new data. If adblock list hasn't changed `Last Time Updated` section does not update.")
+        let dateFormatter = DateFormatter().then {
+            $0.dateStyle = .short
+            $0.timeStyle = .short
+        }
+
+        section.rows = [.init(text: "Last fetch time", detailText:
+                                dateFormatter.string(from: AdblockResourceDownloader.shared.lastFetchDate))]
+
+        return section
+    }
+
     private var datesSection: Section {
         var section = Section(header: "Last time updated",
                               footer: "When the lists were last time updated on the device")

diff --git a/Client/WebFilters/AdblockResourceDownloader.swift b/Client/WebFilters/AdblockResourceDownloader.swift
@@ -34,9 +34,22 @@ class AdblockResourceDownloader {
         Preferences.Shields.useRegionAdBlock.observe(from: self)
     }
 
+    /// Initialized with year 1970 to force adblock fetch at first launch.
+    private(set) var lastFetchDate = Date(timeIntervalSince1970: 0)
+
     func startLoading() {
-        AdblockResourceDownloader.shared.regionalAdblockResourcesSetup()
-        AdblockResourceDownloader.shared.generalAdblockResourcesSetup()
+        let now = Date()
+        let fetchInterval = AppConstants.buildChannel.isPublic ? 6.hours : 10.minutes
+
+        if abs(now.timeIntervalSince(lastFetchDate)) >= fetchInterval {
+            log.debug("Checking if new adblock resources have been uploaded.")
+            lastFetchDate = now
+
+            AdblockResourceDownloader.shared.regionalAdblockResourcesSetup()
+            AdblockResourceDownloader.shared.generalAdblockResourcesSetup()
+        } else {
+            log.debug("Less than 1 hour passed, not checking for new adblock resources")
+        }
     }
 
     func regionalAdblockResourcesSetup() {