Merge branch 'main' into sam/delay-shutting-down-vpn-when-encounterin…

…g-error # By Mariusz Śpiewak (4) and others # Via GitHub (1) and Mariusz Śpiewak (1) * main: Re-prompt for crash reporting (#3595) Fix running BoolFileMarkerTest on device (#3601) Run Sync e2e tests only on latest version (#3602) Release 7.146.0-1 (#3600) Fix autofill search authentication looping (#3598) Fix invalid OmniBar state transition on loading (#3599) Update autoconsent to v11.5.0 (#3581) Release 7.146.0-0 (#3594) deps: Bump CSS@6.36.0 and BSK@211 (#3588) Update subtitle (#3592) Limits TipKit availability to iOS 18+ (#3589) Fix alpha build compilation (#3584) Update VPN auth token check logic (#3585) Fix button shapes on New Tab Page (#3586) Temporarily disable TipKit (#3564) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Nov 21, 2024 · e92ac6c · e92ac6c
2 parents 0af1673 + 20c6e11
commit e92ac6c
Show file tree

Hide file tree

Showing 33 changed files with 886 additions and 106 deletions.
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -40,13 +40,6 @@ jobs:
 
     steps:
 
-    - name: Assert main branch
-      run: |
-        case "${{ github.ref }}" in
-          *main) ;;
-          *) echo "👎 Not main branch"; exit 1 ;;
-        esac
-
     - name: Register SSH keys for access to certificates
       uses: webfactory/ssh-agent@v0.7.0
       with:

diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
@@ -72,7 +72,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        os-version: [15, 16, 17]
+        os-version: [17] #[15, 16, 17]
       max-parallel: 1 # Uncomment this line to run tests sequentially. 
       fail-fast: false
 

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.145.0
+MARKETING_VERSION = 7.146.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 = "\"bd1f5490770791f68fa9667d530758a9\""
-        public static let embeddedDataSHA = "86b8c31a53f781d66dbc16eb09578d28149fee6c0e280fc75ddafeed8a4b46ac"
+        public static let embeddedDataETag = "\"d4536be677d4324aa872d0e59d6fd4fa\""
+        public static let embeddedDataSHA = "a9cce4d5c3430bc3bbca33ad26aa980dcc1c0e792b71ce2696f4483401efbf72"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/BoolFileMarkerTests.swift b/Core/BoolFileMarkerTests.swift
@@ -41,7 +41,11 @@ final class BoolFileMarkerTests: XCTestCase {
         let fileURL = try XCTUnwrap(testFileURL)
 
         let attributes = try FileManager.default.attributesOfItem(atPath: fileURL.path)
+#if targetEnvironment(simulator)
         XCTAssertNil(attributes[.protectionKey])
+#else
+        XCTAssertEqual(attributes[.protectionKey] as? FileProtectionType, FileProtectionType.none)
+#endif
         XCTAssertTrue(FileManager.default.fileExists(atPath: fileURL.path))
         XCTAssertEqual(marker.isPresent, true)
     }

diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -53,6 +53,9 @@ public enum FeatureFlag: String {
 
     /// https://app.asana.com/0/72649045549333/1208617860225199/f
     case networkProtectionEnforceRoutes
+
+    /// https://app.asana.com/0/1208592102886666/1208613627589762/f
+    case crashReportOptInStatusResetting
 }
 
 extension FeatureFlag: FeatureFlagDescribing {
@@ -118,6 +121,8 @@ extension FeatureFlag: FeatureFlagDescribing {
             return .remoteDevelopment(.subfeature(NetworkProtectionSubfeature.enforceRoutes))
         case .adAttributionReporting:
             return .remoteReleasable(.feature(.adAttributionReporting))
+        case .crashReportOptInStatusResetting:
+            return .internalOnly
         }
     }
 }

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,7 +1,16 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1731320660413,
+    "version": 1732039368165,
     "features": {
+        "adAttributionReporting": {
+            "state": "disabled",
+            "exceptions": [],
+            "minSupportedVersion": "7.145.0",
+            "settings": {
+                "includeToken": false
+            },
+            "hash": "1da4782852f0317459b4465d801eda1f"
+        },
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
             "state": "enabled",
@@ -159,6 +168,9 @@
                 {
                     "domain": "eurostar.com"
                 },
+                {
+                    "domain": "geo.fr"
+                },
                 {
                     "domain": "ksta.de"
                 },
@@ -261,9 +273,6 @@
                 {
                     "domain": "motorsport.com"
                 },
-                {
-                    "domain": "paypal.com"
-                },
                 {
                     "domain": "elmundotoday.com"
                 },
@@ -408,7 +417,8 @@
             ],
             "settings": {
                 "disabledCMPs": [
-                    "healthline-media"
+                    "healthline-media",
+                    "bing.com"
                 ]
             },
             "state": "enabled",
@@ -431,7 +441,7 @@
                     }
                 }
             },
-            "hash": "c2885a67db26958bdb316564d5c94878"
+            "hash": "730dcd99d488f1a4ae6f633a7574f8e3"
         },
         "autofillBreakageReporter": {
             "state": "enabled",
@@ -1421,12 +1431,6 @@
                 {
                     "domain": "instructure.com"
                 },
-                {
-                    "domain": "humana.com"
-                },
-                {
-                    "domain": "centerwellpharmacy.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -1444,7 +1448,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "33c2d56a2a9dd43c88a353d8a57dfa72"
+            "hash": "fce0a9ccd7ae060d25e7debe4d8905fb"
         },
         "customUserAgent": {
             "settings": {
@@ -1465,10 +1469,6 @@
                     {
                         "domain": "ihg.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2383"
-                    },
-                    {
-                        "domain": "humana.com",
-                        "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2408"
                     }
                 ],
                 "ddgDefaultSites": [
@@ -1498,7 +1498,7 @@
             },
             "exceptions": [],
             "state": "enabled",
-            "hash": "345d837217e74afd3f9e5fd04b208fa7"
+            "hash": "e577ccb473bdb7ada49c4d3c6e79cf01"
         },
         "dbp": {
             "state": "disabled",
@@ -1526,7 +1526,8 @@
                     "state": "disabled"
                 },
                 "openInNewTab": {
-                    "state": "internal"
+                    "state": "enabled",
+                    "minSupportedVersion": "7.144.0"
                 },
                 "enableDuckPlayer": {
                     "state": "enabled",
@@ -1619,7 +1620,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "c21895584fc5a38e4290c7941ec7d5f8"
+            "hash": "0181fe3479adc4db0b7dd140eb1bcc2e"
         },
         "elementHiding": {
             "exceptions": [
@@ -2315,6 +2316,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "androidauthority.com",
+                        "rules": [
+                            {
+                                "selector": "div[data-ad-type]",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "androidpolice.com",
                         "rules": [
@@ -2913,6 +2923,14 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "expressnews.com",
+                        "rules": [
+                            {
+                                "type": "disable-default"
+                            }
+                        ]
+                    },
                     {
                         "domain": "fandom.com",
                         "rules": [
@@ -3709,6 +3727,10 @@
                             {
                                 "selector": "[class^='ads__right-rail']",
                                 "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".atf_mobile-scroll-ad",
+                                "type": "hide"
                             }
                         ]
                     },
@@ -4981,7 +5003,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "2fa4c7c9bfd50585ee22d6c2d3bd3279"
+            "hash": "16e64ea4c926bdf7c865a8b7cbde1b2b"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5212,6 +5234,15 @@
                 {
                     "domain": "xfinity.com"
                 },
+                {
+                    "domain": "centerwellpharmacy.com"
+                },
+                {
+                    "domain": "go365.com"
+                },
+                {
+                    "domain": "humana.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5232,7 +5263,7 @@
                 }
             ],
             "state": "enabled",
-            "hash": "cd4a8461973d1c1648dd20e6d1f532a7"
+            "hash": "b1f406c6ff87e27244d26289c0e383f9"
         },
         "fingerprintingScreenSize": {
             "settings": {
@@ -5615,6 +5646,15 @@
             "state": "disabled",
             "hash": "728493ef7a1488e4781656d3f9db84aa"
         },
+        "messageBridge": {
+            "exceptions": [],
+            "settings": {
+                "aiChat": "disabled",
+                "domains": []
+            },
+            "state": "disabled",
+            "hash": "cec85d8cf7db4b2abcbc450c66dd63fc"
+        },
         "navigatorInterface": {
             "exceptions": [
                 {
@@ -6898,6 +6938,7 @@
                                     "ah.nl",
                                     "applesfera.com",
                                     "goplay.be",
+                                    "itsthevibe.com",
                                     "nytimes.com",
                                     "realmadrid.com",
                                     "rocketnews24.com",
@@ -6940,6 +6981,7 @@
                                 "rule": "securepubads.g.doubleclick.net/pagead/managed/js/gpt",
                                 "domains": [
                                     "applesfera.com",
+                                    "itsthevibe.com",
                                     "triblive.com"
                                 ]
                             },
@@ -7606,6 +7648,7 @@
                                     "siouxlandnews.com",
                                     "southernoregoncw.com",
                                     "star64.tv",
+                                    "stockcharts.com",
                                     "thecw38.com",
                                     "thecw46.com",
                                     "thecwtc.com",
@@ -8553,6 +8596,7 @@
                                 "domains": [
                                     "signupgenius.com",
                                     "smithsonianmag.com",
+                                    "stockcharts.com",
                                     "titantv.com"
                                 ]
                             },
@@ -9254,6 +9298,12 @@
                                     "<all>"
                                 ]
                             },
+                            {
+                                "rule": "runtime.strm.yandex.ru/player/video/",
+                                "domains": [
+                                    "yandex.cloud"
+                                ]
+                            },
                             {
                                 "rule": "strm.yandex.ru/vh-special-converted/vod-content/",
                                 "domains": [
@@ -9427,7 +9477,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "b7c276ffe1417313a46c0d13fbc9fcd9"
+            "hash": "f2f8b046c4ff4b5afb77a427106619da"
         },
         "trackingCookies1p": {
             "settings": {
@@ -9485,6 +9535,18 @@
                 {
                     "domain": "axs.com"
                 },
+                {
+                    "domain": "urldefense.com"
+                },
+                {
+                    "domain": "centerwellpharmacy.com"
+                },
+                {
+                    "domain": "go365.com"
+                },
+                {
+                    "domain": "humana.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -9534,7 +9596,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "3805ecfb8a129f70a99e73a364b38f38"
+            "hash": "3792a4970c07fe00da08f77e7dcf01ed"
         },
         "userAgentRotation": {
             "settings": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.145.0
		MARKETING_VERSION = 7.146.0