Merge branch 'main' into anh/pir/child-to-parent-broker

duckduckgo · Jan 7, 2025 · 418b810 · 418b810
2 parents 80df190 + a616f97
commit 418b810
Show file tree

Hide file tree

Showing 32 changed files with 1,025 additions and 123 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 333
+CURRENT_PROJECT_VERSION = 337
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.120.0
+MARKETING_VERSION = 1.121.0
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme
@@ -148,6 +148,9 @@
                <Test
                   Identifier = "HTTPSUpgradeIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "MaliciousSiteProtectionIntegrationTests">
+               </Test>
                <Test
                   Identifier = "NavigationProtectionIntegrationTests/testAMPLinks()">
                </Test>

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme
@@ -180,6 +180,9 @@
                <Test
                   Identifier = "HTTPSUpgradeIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "MaliciousSiteProtectionIntegrationTests">
+               </Test>
                <Test
                   Identifier = "NavigationProtectionIntegrationTests/testAMPLinks()">
                </Test>

diff --git a/DuckDuckGo/Assets.xcassets/Images/dax-response.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/dax-response.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Response-DDG-Question-96x96.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Go/Assets.xcassets/Images/dax-response.imageset/Response-DDG-Question-96x96.svg b/...Go/Assets.xcassets/Images/dax-response.imageset/Response-DDG-Question-96x96.svg
diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"5647056efac55d6e77db078ae1011be3\""
-        public static let embeddedDataSHA = "c7c7a010322f1c0a27f5122820f67d1203a986482b1c63172db4b17d6f341acb"
+        public static let embeddedDataETag = "\"a6ade6ceb34c6fa3e77b0904c91edfb8\""
+        public static let embeddedDataSHA = "66c4cfc84a16ab9b60fc34c59fb2876c1e3cd76d40e04b5b3b14825a1ded2771"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1734691010823,
+    "version": 1736158448802,
     "features": {
         "adAttributionReporting": {
             "state": "disabled",
@@ -5158,6 +5158,22 @@
                             {
                                 "selector": "[class*='sdaContainer']",
                                 "type": "hide"
+                            },
+                            {
+                                "selector": "#sda-Horizon-viewer",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id*='mrt-node-Lead']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id*='mrt-node-Secondary']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id*='rrvkqH1']",
+                                "type": "hide-empty"
                             }
                         ]
                     },
@@ -5327,7 +5343,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "f03105d9a96fe2bc97460562f6f61ee2"
+            "hash": "4b7d6ec384400e39c7ad8ca500154b1c"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5555,9 +5571,6 @@
                 {
                     "domain": "secureserver.net"
                 },
-                {
-                    "domain": "hyatt.com"
-                },
                 {
                     "domain": "proton.me"
                 },
@@ -5626,7 +5639,7 @@
                 }
             ],
             "state": "enabled",
-            "hash": "04e4f97a4ad60cd13663ac5d486d3ac4"
+            "hash": "53cc82526eaeeaa1490c8538b78fdb35"
         },
         "fingerprintingScreenSize": {
             "settings": {
@@ -5657,9 +5670,6 @@
                 {
                     "domain": "godaddy.com"
                 },
-                {
-                    "domain": "hyatt.com"
-                },
                 {
                     "domain": "litebluesso.usps.gov"
                 },
@@ -5683,7 +5693,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "9c9c85ea83b8e7c6d07c20d1539a000f"
+            "hash": "a26b20181df02a3dc1cce0945d6e0ccb"
         },
         "fingerprintingTemporaryStorage": {
             "exceptions": [
@@ -5775,6 +5785,9 @@
                 {
                     "domain": "visible.com"
                 },
+                {
+                    "domain": "flyfrontier.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5800,7 +5813,7 @@
                     "privacy-test-pages.site"
                 ]
             },
-            "hash": "7bac9629b3b6d7cbe2e473c1273d31ee"
+            "hash": "fdb3180769d77fd3cedfc8601e184dcd"
         },
         "harmfulApis": {
             "settings": {
@@ -8023,6 +8036,7 @@
                                     "eatroyo.com",
                                     "experian.com",
                                     "ljsilvers.com",
+                                    "tesla.com",
                                     "thesimsresource.com",
                                     "tradersync.com",
                                     "vanguardplan.com",
@@ -8717,6 +8731,16 @@
                             }
                         ]
                     },
+                    "nitropay.com": {
+                        "rules": [
+                            {
+                                "rule": "nitropay.com/ads",
+                                "domains": [
+                                    "maxroll.gg"
+                                ]
+                            }
+                        ]
+                    },
                     "nosto.com": {
                         "rules": [
                             {
@@ -9989,7 +10013,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "b97838ac43243028e26d0b2e1d73c12a"
+            "hash": "55d91756006df4ec366628990eb345d5"
         },
         "trackingCookies1p": {
             "settings": {

diff --git a/DuckDuckGo/HomePage/View/HomePageView.swift b/DuckDuckGo/HomePage/View/HomePageView.swift
@@ -183,7 +183,9 @@ extension HomePage.Views {
 
         @ViewBuilder
         func remoteMessage() -> some View {
-            if let remoteMessage = activeRemoteMessageModel.remoteMessage, let modelType = remoteMessage.content, modelType.isSupported {
+            if let remoteMessage = activeRemoteMessageModel.newTabPageRemoteMessage,
+               let modelType = remoteMessage.content,
+               modelType.isSupported {
                 ZStack {
                     RemoteMessageView(viewModel: .init(
                         messageId: remoteMessage.id,

diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -75,7 +75,7 @@ final class MainViewController: NSViewController {
         self.isBurner = tabCollectionViewModel.isBurner
         self.featureFlagger = featureFlagger
 
-        tabBarViewController = TabBarViewController.create(tabCollectionViewModel: tabCollectionViewModel)
+        tabBarViewController = TabBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, activeRemoteMessageModel: NSApp.delegateTyped.activeRemoteMessageModel)
         bookmarksBarVisibilityManager = BookmarksBarVisibilityManager(selectedTabPublisher: tabCollectionViewModel.$selectedTabViewModel.eraseToAnyPublisher())
 
         let networkProtectionPopoverManager: NetPPopoverManager = {

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -331,12 +331,20 @@ final class MoreOptionsMenu: NSMenu, NSMenuDelegate {
 #if SPARKLE
         guard NSApp.runType != .uiTests,
               let updateController = Application.appDelegate.updateController,
-              let update = updateController.latestUpdate,
-              !update.isInstalled,
-              updateController.updateProgress.isDone
-        else {
+              let update = updateController.latestUpdate else {
             return
         }
+
+        // Log edge cases where menu item appears but doesn't function
+        // To be removed in a future version
+        if !update.isInstalled, updateController.updateProgress.isDone {
+            updateController.log()
+        }
+
+        guard updateController.hasPendingUpdate else {
+            return
+        }
+
         addItem(UpdateMenuItemFactory.menuItem(for: update))
         addItem(NSMenuItem.separator())
 #endif

diff --git a/DuckDuckGo/NewTabPage/ActiveRemoteMessageModel+NewTabPage.swift b/DuckDuckGo/NewTabPage/ActiveRemoteMessageModel+NewTabPage.swift
@@ -21,8 +21,10 @@ import NewTabPage
 import RemoteMessaging
 
 extension ActiveRemoteMessageModel: NewTabPageActiveRemoteMessageProviding {
-    var remoteMessagePublisher: AnyPublisher<RemoteMessageModel?, Never> {
-        $remoteMessage.dropFirst().eraseToAnyPublisher()
+    var newTabPageRemoteMessagePublisher: AnyPublisher<RemoteMessageModel?, Never> {
+        $newTabPageRemoteMessage
+            .dropFirst()
+            .eraseToAnyPublisher()
     }
 
     func isMessageSupported(_ message: RemoteMessageModel) -> Bool {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 333
		CURRENT_PROJECT_VERSION = 337
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 1.120.0
		MARKETING_VERSION = 1.121.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,9 @@ @@
                    <Test
                       Identifier = "HTTPSUpgradeIntegrationTests">
                    </Test>
+                   <Test
+                      Identifier = "MaliciousSiteProtectionIntegrationTests">
+                   </Test>
                    <Test
                       Identifier = "NavigationProtectionIntegrationTests/testAMPLinks()">
                    </Test>
@@ Expand Down @@