Refactor FXIOS-8554 - Adjusting Focus iOS to use the BrowserKit ContentBlockingGenerator (mozilla-mobile#19217)

* Use content blocking generator from browser kit

* Missing file path change

Author: lmarceau

checkout.sh

@@ -7,13 +7,15 @@
 set -x
 cd focus-ios
 
+# Version 107.0 hash
+SHAVAR_COMMIT_HASH="1d71be25893b05ba85850078b1ccedc0824ca958"
+
 # Download the nimbus-fml.sh script from application-services.
 NIMBUS_FML_FILE=./nimbus.fml.yaml
 curl --proto '=https' --tlsv1.2 -sSf  https://raw.githubusercontent.com/mozilla/application-services/main/components/nimbus/ios/scripts/bootstrap.sh | bash -s -- $NIMBUS_FML_FILE
 
-git clone https://github.com/mozilla-services/shavar-prod-lists.git || exit 1
-
-# Grab the las known (pinned) commit on the 93.0 branch
-(cd shavar-prod-lists && git checkout -q 352f772269f13e70893d0d112d26aed1f079ce6e)
+# Clone shavar prod list
+cd .. # Make sure we are at the root of the repo
+rm -rf shavar-prod-lists && git clone https://github.com/mozilla-services/shavar-prod-lists.git && git -C shavar-prod-lists checkout $SHAVAR_COMMIT_HASH
 
-(cd content-blocker-lib-ios/ContentBlockerGen && swift run)
+(cd BrowserKit && swift run)

focus-ios/Blockzilla.xcodeproj/project.pbxproj

@@ -32,10 +32,10 @@ extension TrackingProtectionStatus: Equatable {
 }
 
 enum BlocklistName: String {
-    case advertising = "disconnect-advertising"
-    case analytics = "disconnect-analytics"
-    case content = "disconnect-content"
-    case social = "disconnect-social"
+    case advertising = "disconnect-block-advertising"
+    case analytics = "disconnect-block-analytics"
+    case content = "disconnect-block-content"
+    case social = "disconnect-block-social"
 
     var filename: String { return self.rawValue }
 

focus-ios/Blockzilla/Lib/TrackingProtection/TrackingProtection.swift

@@ -16,10 +16,10 @@ class Utils {
     }
 
     private static let lists: [SettingsToggle: String] = [
-        .blockAds: "disconnect-advertising",
-        .blockAnalytics: "disconnect-analytics",
-        .blockSocial: "disconnect-social",
-        .blockOther: "disconnect-content",
+        .blockAds: "disconnect-block-advertising",
+        .blockAnalytics: "disconnect-block-analytics",
+        .blockSocial: "disconnect-block-social",
+        .blockOther: "disconnect-block-content",
         .blockFonts: "web-fonts"
     ]