Merge branch 'main' into sam/update-wireguard-framework-to-1.1.3

# By Diego Rey Mendez (2) and others # Via GitHub * main: Updates BSK to include latest changes (#2604) Fix VPN feedback form description (#2606) Fixes the name of a pixel (#2575) 22. Subscription- Cleanup and minor updates (#2596) Release 7.112.0-3 (#2602) update embedded file Bump autoconsent to 10.3.0 (#2601) Roll back CPM post-rollout cleanup (#2599) Stub objects for Bookmarks DB (#2593) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Mar 18, 2024 · feda6bf · feda6bf
2 parents 260af1e + 0dbf447
commit feda6bf
Show file tree

Hide file tree

Showing 44 changed files with 1,390 additions and 731 deletions.
diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"73cfb8d6f397fd1de921f057db1bcc44\""
-        public static let embeddedDataSHA = "3debb4a1e5c6cc292b3c03d9ea6ce4daa8073ab0c033131f2f8dbe1f752dfaf1"
+        public static let embeddedDataETag = "\"c595f46fe54bfa96bbff4f30fc3940d8\""
+        public static let embeddedDataSHA = "911e6616b6869c0940c492240d43c0cf60274755dd45a50cc635c8b7c792cb87"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/BookmarksCachingSearch.swift b/Core/BookmarksCachingSearch.swift
@@ -63,9 +63,10 @@ public class CoreDataBookmarksSearchStore: BookmarksSearchStore {
 
         let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "BookmarkEntity")
         fetchRequest.predicate = NSPredicate(
-            format: "%K = false AND %K == NO",
+            format: "%K = false AND %K == NO AND (%K == NO OR %K == nil)",
             #keyPath(BookmarkEntity.isFolder),
-            #keyPath(BookmarkEntity.isPendingDeletion)
+            #keyPath(BookmarkEntity.isPendingDeletion),
+            #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub)
         )
         fetchRequest.resultType = .dictionaryResultType
         fetchRequest.propertiesToFetch = [#keyPath(BookmarkEntity.title),

diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -36,6 +36,7 @@ public enum FeatureFlag: String {
     case networkProtectionWaitlistActive
     case subscription
     case swipeTabs
+    case autoconsentOnByDefault
     case history
 }
 
@@ -66,6 +67,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutofillSubfeature.onByDefault))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
+        case .autoconsentOnByDefault:
+            return .remoteReleasable(.subfeature(AutoconsentSubfeature.onByDefault))
         case .history:
             return .remoteReleasable(.feature(.history))
         }

diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -150,7 +150,14 @@ public class Pixel {
         case atb
         case appVersion
     }
+
+
+    private enum Constant {
+        static let pixelStorageIdentifier = "com.duckduckgo.pixel.storage"
+    }
 
+    public static let storage = UserDefaults(suiteName: Constant.pixelStorageIdentifier)!
+
     private init() {
     }
 
@@ -160,16 +167,28 @@ public class Pixel {
                             allowedQueryReservedCharacters: CharacterSet? = nil,
                             withHeaders headers: APIRequest.Headers = APIRequest.Headers(),
                             includedParameters: [QueryParameters] = [.atb, .appVersion],
-                            onComplete: @escaping (Error?) -> Void = { _ in }) {
-        fire(
-            pixelNamed: pixel.name,
-            forDeviceType: deviceType,
-            withAdditionalParameters: params,
-            allowedQueryReservedCharacters: allowedQueryReservedCharacters,
-            withHeaders: headers,
-            includedParameters: includedParameters,
-            onComplete: onComplete
-        )
+                            onComplete: @escaping (Error?) -> Void = { _ in },
+                            debounce: Int = 0) {
+
+        let date = Date().addingTimeInterval(-TimeInterval(debounce))
+        if !pixel.hasBeenFiredSince(pixelStorage: storage, date: date) {
+            fire(
+                pixelNamed: pixel.name,
+                forDeviceType: deviceType,
+                withAdditionalParameters: params,
+                allowedQueryReservedCharacters: allowedQueryReservedCharacters,
+                withHeaders: headers,
+                includedParameters: includedParameters,
+                onComplete: onComplete
+            )
+            updatePixelLastFireDate(pixel: pixel)
+        } else {
+            onComplete(nil)
+        }
+    }
+
+    private static func updatePixelLastFireDate(pixel: Pixel.Event) {
+        storage.set(Date(), forKey: pixel.name)
     }
 
     public static func fire(pixelNamed pixelName: String,
@@ -240,6 +259,18 @@ extension Pixel {
     }
 }
 
+private extension Pixel.Event {
+
+    func hasBeenFiredSince(pixelStorage: UserDefaults, date: Date) -> Bool {
+        if let lastFireDate = pixelStorage.object(forKey: name) as? Date {
+            return lastFireDate >= date
+        }
+        return false
+    }
+
+
+}
+
 /// NSError supports this through `NSUnderlyingError`, but there's no support for this for Swift's `Error`.  This protocol does that.
 ///
 /// The reason why this protocol returns a code and a domain instead of just an `Error` or `NSError` is so that the error implementing

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -861,7 +861,7 @@ extension Pixel.Event {
         case .networkProtectionTunnelFailureRecovered: return "m_netp_ev_tunnel_failure_recovered"
         case .networkProtectionLatency(let quality): return "m_netp_ev_\(quality.rawValue)_latency"
         case .networkProtectionLatencyError: return "m_netp_ev_latency_error_d"
-        case .networkProtectionRekeyAttempt: return "m_mac_netp_rekey_attempt"
+        case .networkProtectionRekeyAttempt: return "m_netp_rekey_attempt"
         case .networkProtectionRekeyCompleted: return "m_netp_rekey_completed"
         case .networkProtectionRekeyFailure: return "m_netp_rekey_failure"
         case .networkProtectionEnabledOnSearch: return "m_netp_ev_enabled_on_search"

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1710155313369,
+    "version": 1710501855617,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -264,6 +264,18 @@
                 {
                     "domain": "meneame.net"
                 },
+                {
+                    "domain": "espn.com"
+                },
+                {
+                    "domain": "usaa.com"
+                },
+                {
+                    "domain": "publico.es"
+                },
+                {
+                    "domain": "cnbc.com"
+                },
                 {
                     "domain": "earth.google.com"
                 },
@@ -292,7 +304,7 @@
             "state": "enabled",
             "features": {
                 "onByDefault": {
-                    "state": "enabled",
+                    "state": "disabled",
                     "rollout": {
                         "steps": [
                             {
@@ -308,7 +320,7 @@
                     }
                 }
             },
-            "hash": "7401ca90e7ef3907f1c0f8cdf163b994"
+            "hash": "9aaa080c235ddd8df4295c4d73c87a94"
         },
         "autofill": {
             "exceptions": [
@@ -1028,8 +1040,11 @@
         },
         "clientBrandHint": {
             "exceptions": [],
+            "settings": {
+                "domains": []
+            },
             "state": "disabled",
-            "hash": "728493ef7a1488e4781656d3f9db84aa"
+            "hash": "d35dd75140cdfe166762013e59eb076d"
         },
         "contentBlocking": {
             "state": "enabled",
@@ -3925,6 +3940,23 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "uzone.id",
+                        "rules": [
+                            {
+                                "selector": "[class^='box-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[class^='section-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".parallax-container",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "washingtontimes.com",
                         "rules": [
@@ -4005,7 +4037,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "065f70c0112e8f3a149bf4bc56f35203"
+            "hash": "2f1178300a22f85803bc42c676ea2cab"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -4670,11 +4702,6 @@
             "state": "disabled",
             "hash": "d07b5bf740e4d648c94e1ac65c4305d9"
         },
-        "notificationPermissions": {
-            "exceptions": [],
-            "state": "disabled",
-            "hash": "728493ef7a1488e4781656d3f9db84aa"
-        },
         "privacyDashboard": {
             "exceptions": [],
             "features": {
@@ -5929,22 +5956,11 @@
                     "fwmrm.net": {
                         "rules": [
                             {
-                                "rule": "2a7e9.v.fwmrm.net/ad/g/1",
-                                "domains": [
-                                    "channel4.com"
-                                ]
-                            },
-                            {
-                                "rule": "2a7e9.v.fwmrm.net/ad/l/1",
+                                "rule": "v.fwmrm.net/ad",
                                 "domains": [
+                                    "6play.fr",
                                     "channel4.com"
                                 ]
-                            },
-                            {
-                                "rule": "7cbf2.v.fwmrm.net/ad/g/1",
-                                "domains": [
-                                    "6play.fr"
-                                ]
                             }
                         ]
                     },
@@ -7849,7 +7865,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "cff67ed6fc2962e0016ac3c65b6e4633"
+            "hash": "4d2da0fe5691d4283ebfb1021270c6ea"
         },
         "trackingCookies1p": {
             "settings": {