Merge branch 'ldev'

arjpar · Jan 22, 2025 · ab298ba · ab298ba
2 parents 8e13902 + f7147c7
commit ab298ba
Show file tree

Hide file tree

Showing 161 changed files with 7,445 additions and 4,762 deletions.
diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Ads.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Ads.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00C356262D2EEFE000BACCE7"
-               BuildableName = "WebShield Ads.appex"
-               BlueprintName = "WebShield Ads"
+               BuildableName = "WebShieldAds.appex"
+               BlueprintName = "WebShieldAds"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Advanced.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Advanced.xcscheme
@@ -16,8 +16,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "006FC39B2D3095DD0091056F"
-               BuildableName = "WebShield Advanced.appex"
-               BlueprintName = "WebShield Advanced"
+               BuildableName = "WebShieldAdvanced.appex"
+               BlueprintName = "WebShieldAdvanced"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -55,8 +55,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "006FC39B2D3095DD0091056F"
-            BuildableName = "WebShield Advanced.appex"
-            BlueprintName = "WebShield Advanced"
+            BuildableName = "WebShieldAdvanced.appex"
+            BlueprintName = "WebShieldAdvanced"
             ReferencedContainer = "container:WebShield.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Annoyances.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Annoyances.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718C42D3453FF00FD22A7"
-               BuildableName = "WebShield Annoyances.appex"
-               BlueprintName = "WebShield Annoyances"
+               BuildableName = "WebShieldAnnoyances.appex"
+               BlueprintName = "WebShieldAnnoyances"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Cookies.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Cookies.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E7189C2D3453CF00FD22A7"
-               BuildableName = "WebShield Cookies.appex"
-               BlueprintName = "WebShield Cookies"
+               BuildableName = "WebShieldCookies.appex"
+               BlueprintName = "WebShieldCookies"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Custom.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Custom.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E719002D34545D00FD22A7"
-               BuildableName = "WebShield Custom.appex"
-               BlueprintName = "WebShield Custom"
+               BuildableName = "WebShieldCustom.appex"
+               BlueprintName = "WebShieldCustom"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Experimental.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Experimental.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718EC2D34543F00FD22A7"
-               BuildableName = "WebShield Experimental.appex"
-               BlueprintName = "WebShield Experimental"
+               BuildableName = "WebShieldExperimental.appex"
+               BlueprintName = "WebShieldExperimental"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Multipurpose.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Multipurpose.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718882D3453BC00FD22A7"
-               BuildableName = "WebShield Multipurpose.appex"
-               BlueprintName = "WebShield Multipurpose"
+               BuildableName = "WebShieldMultipurpose.appex"
+               BlueprintName = "WebShieldMultipurpose"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Privacy.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Privacy.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718602D3452EC00FD22A7"
-               BuildableName = "WebShield Privacy.appex"
-               BlueprintName = "WebShield Privacy"
+               BuildableName = "WebShieldPrivacy.appex"
+               BlueprintName = "WebShieldPrivacy"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Regional.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Regional.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718D82D34542600FD22A7"
-               BuildableName = "WebShield Regional.appex"
-               BlueprintName = "WebShield Regional"
+               BuildableName = "WebShieldRegional.appex"
+               BlueprintName = "WebShieldRegional"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Security.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Security.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718742D3453A700FD22A7"
-               BuildableName = "WebShield Security.appex"
-               BlueprintName = "WebShield Security"
+               BuildableName = "WebShieldSecurity.appex"
+               BlueprintName = "WebShieldSecurity"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Social.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield Social.xcscheme
@@ -17,8 +17,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "00E718B02D3453E600FD22A7"
-               BuildableName = "WebShield Social.appex"
-               BlueprintName = "WebShield Social"
+               BuildableName = "WebShieldSocial.appex"
+               BlueprintName = "WebShieldSocial"
                ReferencedContainer = "container:WebShield.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

diff --git a/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield.xcscheme b/WebShield.xcodeproj/xcshareddata/xcschemes/WebShield.xcscheme
@@ -43,7 +43,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"

diff --git a/WebShieldAds/Info.plist b/WebShieldAds/Info.plist
@@ -1,15 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.Safari.content-blocker</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>$(PRODUCT_MODULE_NAME).ContentBlockerRequestHandler</string>
-	</dict>
-	<key>NSHumanReadableDescription</key>
-	<string>Declarative wide-spectrum content blocking for WebShield for the "ads" category.</string>
-</dict>
+    <dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>$(DEVELOPMENT_LANGUAGE)</string>
+        <key>CFBundleDisplayName</key>
+        <string>$(APP_DISPLAY_NAME)</string>
+        <key>CFBundleExecutable</key>
+        <string>$(EXECUTABLE_NAME)</string>
+        <key>CFBundleIdentifier</key>
+        <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>$(PRODUCT_NAME)</string>
+        <key>CFBundlePackageType</key>
+        <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+        <key>CFBundleShortVersionString</key>
+        <string>$(MARKETING_VERSION)</string>
+        <key>CFBundleVersion</key>
+        <string>$(CURRENT_PROJECT_VERSION)</string>
+        <key>ITSAppUsesNonExemptEncryption</key>
+        <false/>
+        <key>LSMinimumSystemVersion</key>
+        <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+        <key>NSExtension</key>
+        <dict>
+            <key>NSExtensionPointIdentifier</key>
+            <string>com.apple.Safari.content-blocker</string>
+            <key>NSExtensionPrincipalClass</key>
+            <string>$(PRODUCT_MODULE_NAME).ContentBlockerRequestHandler</string>
+        </dict>
+        <key>NSHumanReadableDescription</key>
+        <string>Block annoying cookie and tracking consent notices while keeping your privacy.</string>
+    </dict>
 </plist>
diff --git a/WebShieldAds/Source/ContentBlockerRequestHandler.swift b/WebShieldAds/Source/ContentBlockerRequestHandler.swift
@@ -14,12 +14,12 @@ final class ContentBlockerRequestHandler: NSObject, NSExtensionRequestHandling {
                 forSecurityApplicationGroupIdentifier: requiredPart)
         else {
             logger.log(
-                "Error: Could not get container URL for group \(requiredPart, privacy: .public)")
+                "Error: Could not get container URL for group \(requiredPart)")
             context.completeRequest(returningItems: nil, completionHandler: nil)
             return
         }
 
-        logger.log("Successfully got container URL for group \(requiredPart, privacy: .public)")
+        logger.log("Successfully got container URL for group \(requiredPart)")
 
         let blockerlistURL = containerURL.appendingPathComponent(
             "ads.json")

diff --git a/WebShieldAdvanced/Info.plist b/WebShieldAdvanced/Info.plist
@@ -2,6 +2,28 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>$(DEVELOPMENT_LANGUAGE)</string>
+    <key>CFBundleDisplayName</key>
+    <string>$(APP_DISPLAY_NAME)</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundlePackageType</key>
+    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+    <key>CFBundleShortVersionString</key>
+    <string>$(MARKETING_VERSION)</string>
+    <key>CFBundleVersion</key>
+    <string>$(CURRENT_PROJECT_VERSION)</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+    <key>LSMinimumSystemVersion</key>
+    <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/WebShieldAdvanced/Resources/_locales/en/messages.json b/WebShieldAdvanced/Resources/_locales/en/messages.json
@@ -1,10 +1,10 @@
 {
-    "extension_name": {
-        "message": "WebShield Advanced",
-        "description": "The display name for the extension."
-    },
-    "extension_description": {
-        "message": "Ad-blocker for complex ads.",
-        "description": "Description of what the extension does."
-    }
+  "extension_name": {
+    "message": "WebShield Advanced",
+    "description": "The display name for the extension."
+  },
+  "extension_description": {
+    "message": "Ad-blocker for complex ads.",
+    "description": "Description of what the extension does."
+  }
 }