Add FXIOS-8088 [v125] WebEngine API: disable tracking protection

mozilla-mobile · Mar 5, 2024 · 76d8d26 · 76d8d26
1 parent 8acdc03
commit 76d8d26
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/BrowserKit/Sources/WebEngine/EngineSession.swift b/BrowserKit/Sources/WebEngine/EngineSession.swift
@@ -57,6 +57,9 @@ public protocol EngineSession {
     /// Switch to strict tracking protection mode.
     func switchToStrictTrackingProtection()
 
+    /// Disable all tracking protection.
+    func disableTrackingProtection()
+
     /// Toggle image blocking mode.
     func toggleNoImageMode()
 

diff --git a/BrowserKit/Sources/WebEngine/WKWebview/WKEngineSession.swift b/BrowserKit/Sources/WebEngine/WKWebview/WKEngineSession.swift
@@ -165,6 +165,13 @@ class WKEngineSession: NSObject,
         metadataFetcher.delegate = nil
     }
 
+    func disableTrackingProtection() {
+        var settings = contentBlockingSettings
+        settings.remove(.strict)
+        settings.remove(.standard)
+        contentBlockingSettings = settings
+    }
+
     func switchToStandardTrackingProtection() {
         var settings = contentBlockingSettings
         settings.remove(.strict)

diff --git a/SampleBrowser/SampleBrowser/UI/Browser/BrowserViewController.swift b/SampleBrowser/SampleBrowser/UI/Browser/BrowserViewController.swift
@@ -122,6 +122,10 @@ class BrowserViewController: UIViewController,
         engineSession.switchToStrictTrackingProtection()
     }
 
+    func disableTrackingProtection() {
+        engineSession.disableTrackingProtection()
+    }
+
     func toggleNoImageMode() {
         engineSession.toggleNoImageMode()
     }

diff --git a/SampleBrowser/SampleBrowser/UI/RootViewController.swift b/SampleBrowser/SampleBrowser/UI/RootViewController.swift
@@ -211,6 +211,10 @@ class RootViewController: UIViewController,
         browserVC.switchToStandardTrackingProtection()
     }
 
+    func disableTrackingProtection() {
+        browserVC.disableTrackingProtection()
+    }
+
     func toggleNoImageMode() {
         browserVC.toggleNoImageMode()
     }

diff --git a/SampleBrowser/SampleBrowser/UI/Settings/SettingsDataSource.swift b/SampleBrowser/SampleBrowser/UI/Settings/SettingsDataSource.swift
@@ -15,6 +15,8 @@ class SettingsDataSource: NSObject, UITableViewDataSource {
                                   title: "Trigger standard content blocking"),
             SettingsCellViewModel(settingType: .strictContentBlocking,
                                   title: "Trigger strict content blocking"),
+            SettingsCellViewModel(settingType: .disableContentBlocking,
+                                  title: "Disable content blocking"),
             SettingsCellViewModel(settingType: .noImageMode,
                                   title: "Trigger No Images"),
             SettingsCellViewModel(settingType: .zoomIncrease,

diff --git a/SampleBrowser/SampleBrowser/UI/Settings/SettingsDelegate.swift b/SampleBrowser/SampleBrowser/UI/Settings/SettingsDelegate.swift
@@ -9,6 +9,7 @@ protocol SettingsDelegate: AnyObject {
     func showFindInPage()
     func switchToStrictTrackingProtection()
     func switchToStandardTrackingProtection()
+    func disableTrackingProtection()
     func toggleNoImageMode()
     func increaseZoom()
     func decreaseZoom()

diff --git a/SampleBrowser/SampleBrowser/UI/Settings/SettingsType.swift b/SampleBrowser/SampleBrowser/UI/Settings/SettingsType.swift
@@ -8,6 +8,7 @@ import Foundation
 public enum SettingsType: String {
     case standardContentBlocking
     case strictContentBlocking
+    case disableContentBlocking
     case noImageMode
     case findInPage
     case scrollingToTop

diff --git a/SampleBrowser/SampleBrowser/UI/Settings/SettingsViewController.swift b/SampleBrowser/SampleBrowser/UI/Settings/SettingsViewController.swift
@@ -85,6 +85,8 @@ class SettingsViewController: UIViewController, UITableViewDelegate {
             delegate?.switchToStandardTrackingProtection()
         case .strictContentBlocking:
             delegate?.switchToStrictTrackingProtection()
+        case .disableContentBlocking:
+            delegate?.disableTrackingProtection()
         case .noImageMode:
             delegate?.toggleNoImageMode()
         case .findInPage: