Merge branch 'main' into sam/vpn-snooze-initial-support

# By Daniel Bernal (4) and others # Via Chris Brind (3) and others * main: [DuckPlayer] 10 . Move DuckPlayer init to TabManager (#3124) Fix threading issue with Mesage broker (#3132) [Duckplayer] - 9. Edge Cases (#3115) Release 7.130.0-2 (#3134) Internal update for: fix index out-of-bounds in startAttachingCrashLogMessages (#3123) (#3128) Attach params to PPro pixels (#3092) Don't show key icon for empty passwords (#3070) Release 7.129.1-0 (#3127) fix index out-of-bounds in startAttachingCrashLogMessages (#3123) Release 7.130.0-1 (#3122) Revert old Dax icon for old onboarding (#3085) Scroll to Internal User setting (#3114) Release 7.130.0-0 (#3118) Allow activating subscription for internal users via debug menu (#3117) Update breakage report locale to JSON format (#3112) [Duckplayer] 8. Age restricted videos (#3111) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Jul 25, 2024 · 19b9362 · 19b9362
2 parents 4a4aa1a + 93b8221
commit 19b9362
Show file tree

Hide file tree

Showing 46 changed files with 1,323 additions and 401 deletions.
diff --git a/.maestro/shared/set_internal_user_from_settings.yaml b/.maestro/shared/set_internal_user_from_settings.yaml
@@ -5,6 +5,8 @@ appId: com.duckduckgo.mobile.ios
     element: All debug options
 - assertVisible: All debug options
 - tapOn: All debug options
+- scrollUntilVisible:
+    element: Internal User State
 - tapOn: Internal User State
 - tapOn: Settings
 - tapOn: Done

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.129.0
+MARKETING_VERSION = 7.130.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 = "\"d73997ee1028028a4259dec5f9c4beca\""
-        public static let embeddedDataSHA = "2810166895dee6bfebfc57d6dc041ef008bf85f9346e541c963d63d8fa1dc2dc"
+        public static let embeddedDataETag = "\"6731933419540cb11a6a0898b0c26bdb\""
+        public static let embeddedDataSHA = "88b018fcabee20e6a210d3c65f122c0019ca5bb900c9a0148945e4c4c609856d"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/DefaultVariantManager.swift b/Core/DefaultVariantManager.swift
@@ -50,7 +50,7 @@ public struct VariantIOS: Variant {
     }
 
     /// This variant is used for returning users to separate them from really new users.
-    static let returningUser = VariantIOS(name: "ru", weight: doNotAllocate, isIncluded: When.always, features: [])
+    public static let returningUser = VariantIOS(name: "ru", weight: doNotAllocate, isIncluded: When.always, features: [])
 
     static let doNotAllocate = 0
 

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1720796469387,
+    "version": 1721406809556,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -1523,6 +1523,10 @@
                         "selector": "#leaderboard",
                         "type": "closest-empty"
                     },
+                    {
+                        "selector": "#leaderboard-container",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".leaderboard_wrapper",
                         "type": "hide-empty"
@@ -1551,6 +1555,10 @@
                         "selector": "#topAd",
                         "type": "hide-empty"
                     },
+                    {
+                        "selector": "#topad",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".ad-banner-container",
                         "type": "hide-empty"
@@ -2850,6 +2858,27 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "gizmodo.com",
+                        "rules": [
+                            {
+                                "selector": ".banner-top",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".od-wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".widget_keleops-ad",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id^='optidigital-adslot-Billboard']",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "google.com",
                         "rules": [
@@ -4581,7 +4610,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "c69c499b65697c42f660e3c5588bebe4"
+            "hash": "507d3d1aba39974635faf482e944f310"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5227,6 +5256,21 @@
             ],
             "hash": "1a1a4652687f25da9f351df157c5e051"
         },
+        "phishingDetection": {
+            "state": "disabled",
+            "exceptions": [
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                },
+                {
+                    "domain": "noaprints.com"
+                }
+            ],
+            "hash": "7b395d1b9b54fd08f5a949b920d28552"
+        },
         "pluginPointFocusedViewPlugin": {
             "state": "disabled",
             "exceptions": [],
@@ -8808,6 +8852,9 @@
         },
         "webCompat": {
             "exceptions": [
+                {
+                    "domain": "crocs.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8861,7 +8908,7 @@
                     }
                 ]
             },
-            "hash": "25d935f0276cd0d81fc6f25811f7cb36"
+            "hash": "895bea376ffb485029872b8279778ce6"
         },
         "webViewBlobDownload": {
             "exceptions": [],