Merge branch 'main' into jacek/refactor-app-delegate-milestone-2

duckduckgo · Feb 10, 2025 · 8c1e74d · 8c1e74d
2 parents 383ea04 + 462b3dc
commit 8c1e74d
Show file tree

Hide file tree

Showing 90 changed files with 3,088 additions and 1,011 deletions.
diff --git a/.maestro/browser_features/state_restoration.yaml b/.maestro/browser_features/state_restoration.yaml
@@ -18,8 +18,10 @@ tags:
 - pressKey: Enter
 
 # Create navigation stack
-- assertVisible: "English"
-- tapOn: "English"
+- assertVisible: 'English.*'
+- tapOn: 
+    text: 'English.*'
+    childOf: "Top languages, navigation"
 - assertVisible: "Welcome to Wikipedia.*"
 - tapOn: "Wikipedia" 
 - assertVisible: "Article"

diff --git a/.maestro/privacy_tests/10_expired_certificate.yaml b/.maestro/privacy_tests/10_expired_certificate.yaml
@@ -17,8 +17,8 @@ tags:
 - inputText: "https://expired.badssl.com"
 - pressKey: Enter
 - assertVisible: "Warning: This site may be insecure"
-- assertNotVisible: 
-    id: "LogoIcon"
+- assertVisible:
+    id: "Globe-24"
 - tapOn: "Leave This Site"
 - assertNotVisible: "Warning: This site may be insecure"
 
@@ -27,11 +27,13 @@ tags:
     id: "searchEntry"
 - inputText: "https://expired.badssl.com"
 - pressKey: Enter
+- assertVisible:
+    id: "Globe-24"
 - tapOn: "Advanced"
 - scroll
 - tapOn: "Accept Risk and Visit Site"
 - assertVisible: 
-    id: "LogoIcon"
+    id: "privacy-icon-shield.button"
 - assertVisible: "expired.badssl.com"
 
 
diff --git a/.maestro/shared/sync_recover_data.yaml b/.maestro/shared/sync_recover_data.yaml
@@ -10,6 +10,11 @@ appId: com.duckduckgo.mobile.ios
 - pressKey: Enter
 - assertVisible: Get Started
 - tapOn: Get Started
+- runFlow:
+    when:
+      visible: Allows you to upload photographs and videos
+    commands:
+        - tapOn: "Allow"
 - tapOn: Enter Text Code Manually
 - tapOn: Paste
 - assertVisible: Save Recovery Code

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.156.0
+MARKETING_VERSION = 7.157.0
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 = "\"976c63da5b20ab60df3aa314b82fa26e\""
-        public static let embeddedDataSHA = "ff981cdb2444834b370c0b64e325a10493bb57bddcc1daec5afb3000f5a8ff5f"
+        public static let embeddedDataETag = "\"bb2a054a5a85590bd0289de2f2c6b938\""
+        public static let embeddedDataSHA = "4beea7a26ff011e0f5290763fb5b672be2e3fc74fcf0ab5088581bd2d8b0d019"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/ContentBlockerRulesLists.swift b/Core/ContentBlockerRulesLists.swift
@@ -34,7 +34,8 @@ public final class ContentBlockerRulesLists: DefaultContentBlockerRulesListsSour
         if adClickAttribution.isEnabled,
            let tdsRulesIndex = result.firstIndex(where: { $0.name == Constants.trackerDataSetRulesListName }) {
             let tdsRules = result[tdsRulesIndex]
-            let allowlistedTrackerNames = adClickAttribution.allowlist.map { $0.entity }
+            let allowlist = adClickAttribution.allowlist
+            let allowlistedTrackerNames = allowlist.map { $0.entity }
             let splitter = AdClickAttributionRulesSplitter(rulesList: tdsRules, allowlistedTrackerNames: allowlistedTrackerNames)
             if let splitRules = splitter.split() {
                 result.remove(at: tdsRulesIndex)

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1738617060063,
+    "version": 1739190984719,
     "features": {
         "adAttributionReporting": {
             "state": "disabled",
@@ -500,9 +500,24 @@
                 {
                     "domain": "ib3.org"
                 },
+                {
+                    "domain": "bergwelten.com"
+                },
                 {
                     "domain": "bibliotheek.be"
                 },
+                {
+                    "domain": "volcanoteide.com"
+                },
+                {
+                    "domain": "dwaalzin.nu"
+                },
+                {
+                    "domain": "omegawatches.com"
+                },
+                {
+                    "domain": "russafasingluten.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -687,7 +702,7 @@
                     }
                 }
             },
-            "hash": "8c8daddfd6e27dcd7ef593f24d9a4073"
+            "hash": "61d2fa5b7a2ac83e2d013e0ed1f0aae2"
         },
         "autofillBreakageReporter": {
             "state": "enabled",
@@ -1630,7 +1645,33 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "96b2f778bab196aa424e9c859ddea778"
+            "features": {
+                "tdsNextExperimentBaseline": {
+                    "state": "enabled",
+                    "rollout": {
+                        "steps": [
+                            {
+                                "percent": 50
+                            }
+                        ]
+                    },
+                    "settings": {
+                        "controlUrl": "v5/temp/ios-tds.json",
+                        "treatmentUrl": "v5/temp/ios-tds-b.json"
+                    },
+                    "cohorts": [
+                        {
+                            "name": "control",
+                            "weight": 1
+                        },
+                        {
+                            "name": "treatment",
+                            "weight": 1
+                        }
+                    ]
+                }
+            },
+            "hash": "430ad988df515217c667b86b1ca252e6"
         },
         "contextualOnboarding": {
             "exceptions": [],
@@ -2518,6 +2559,21 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "abcnews.go.com",
+                        "rules": [
+                            {
+                                "selector": ".navigation",
+                                "type": "modify-style",
+                                "values": [
+                                    {
+                                        "property": "top",
+                                        "value": "0px"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
                     {
                         "domain": "accuweather.com",
                         "rules": [
@@ -2622,6 +2678,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "autoby.jp",
+                        "rules": [
+                            {
+                                "selector": ".ad-center",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "avito.ru",
                         "rules": [
@@ -5416,7 +5481,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "17bde32dfb0af9fafb6c808adf7145cb"
+            "hash": "efda959788d70dbe8e931840be862bda"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5996,6 +6061,11 @@
             },
             "hash": "e705c70baeee9f16f5c481a5be1d95b9"
         },
+        "htmlHistoryPage": {
+            "state": "disabled",
+            "exceptions": [],
+            "hash": "c292bb627849854515cebbded288ef5a"
+        },
         "htmlNewTabPage": {
             "state": "disabled",
             "exceptions": [],
@@ -6850,7 +6920,7 @@
                     "alicdn.com": {
                         "rules": [
                             {
-                                "rule": "alicdn.com/g/qwenweb/qwen-webui-fe/0.0.15",
+                                "rule": "alicdn.com/g/qwenweb/qwen-webui-fe/",
                                 "domains": [
                                     "qwenlm.ai"
                                 ]
@@ -10075,7 +10145,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "91135866917545966d19e300f74e5743"
+            "hash": "e2f5170e42e9861517e09f864f3a3848"
         },
         "trackingCookies1p": {
             "settings": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.156.0
		MARKETING_VERSION = 7.157.0