Merge branch 'main' into sam/remove-test-rollout-pixel

# By Dominik Kapusta (4) and others # Via Dominik Kapusta (1) and others * main: VPN clean-up (#3474) Update Ruby to 3.3.4 (#3519) Fix UI tests failing (#3517) Add menu option to set as default browser (#3508) Bump version to 1.113.0 (300) Deprecate PixelKit daily pixel suffixes (#3509) Update permission usage description strings in Info.plist (#3518) Fix add to favorites and open in new tabs action not working on manager (#3467) Hiding of tab previews for pinned tabs fixed (#3513) Update C-S-S to 6.29.0 (#3515) Freemium PIR: Ship Review Changes - Updated New Tab Banner UI (#3501) Send pixel on sync secure storage read failure (#3497) Remove com.apple.security.device.usb entitlement (#3495) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Nov 6, 2024 · 062d689 · 062d689
2 parents 1c18910 + 1cd1cab
commit 062d689
Show file tree

Hide file tree

Showing 61 changed files with 497 additions and 292 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.4
+3.3.4
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 298
+CURRENT_PROJECT_VERSION = 300
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14777,8 +14777,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				branch = "sam/remove-test-rollout-pixel";
-				kind = branch;
+				kind = exactVersion;
+				version = 205.0.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "branch" : "sam/remove-test-rollout-pixel",
-        "revision" : "40b7a3763ed74ab080d5a9480e2e5a3512e75408"
+        "revision" : "1d228b8fde43e7ab5f28e7a511f440676e6b05a8",
+        "version" : "205.0.0"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "48fee2508995d4ac02d18b3d55424adedcb4ce4f",
-        "version" : "6.28.0"
+        "revision" : "6cab7bdb584653a5dc007cc1ae827ec41c5a91bc",
+        "version" : "6.29.0"
       }
     },
     {
@@ -75,7 +75,7 @@
     {
       "identity" : "lottie-spm",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/airbnb/lottie-spm.git",
+      "location" : "https://github.com/airbnb/lottie-spm",
       "state" : {
         "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
         "version" : "4.4.3"

diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -471,6 +471,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         freemiumDBPScanResultPolling = DefaultFreemiumDBPScanResultPolling(dataManager: DataBrokerProtectionManager.shared.dataManager, freemiumDBPUserStateManager: freemiumDBPUserStateManager)
         freemiumDBPScanResultPolling?.startPollingOrObserving()
+
+        PixelKit.fire(NonStandardEvent(GeneralPixel.launch(isDefault: DefaultBrowserPreferences().isDefault)))
     }
 
     private func fireFailedCompilationsPixelIfNeeded() {

diff --git a/DuckDuckGo/Assets.xcassets/Images/DefaultBrowserMenuItem.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/DefaultBrowserMenuItem.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Set-as-Default-16D.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/...o/Assets.xcassets/Images/DefaultBrowserMenuItem.imageset/Set-as-Default-16D.svg b/...o/Assets.xcassets/Images/DefaultBrowserMenuItem.imageset/Set-as-Default-16D.svg
diff --git a/DuckDuckGo/Assets.xcassets/Information-Remover-128.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Information-Remover-128.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Information-Remover-128.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Information-Remover-128.imageset/Information-Remover-128.pdf b/DuckDuckGo/Assets.xcassets/Information-Remover-128.imageset/Information-Remover-128.pdf
diff --git a/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift b/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
@@ -28,6 +28,13 @@ extension Tab {
         }
     }
 
+    @MainActor
+    static func with(contentsOf bookmarks: [Bookmark], burnerMode: BurnerMode) -> [Tab] {
+        bookmarks.compactMap { bookmark -> Tab? in
+            guard let url = bookmark.urlObject else { return nil }
+            return Tab(content: .url(url, source: .bookmark), shouldLoadInBackground: true, burnerMode: burnerMode)
+        }
+    }
 }
 
 extension TabCollection {

diff --git a/DuckDuckGo/Bookmarks/Services/BookmarksContextMenu.swift b/DuckDuckGo/Bookmarks/Services/BookmarksContextMenu.swift
@@ -308,13 +308,17 @@ extension BookmarksContextMenu: BookmarkMenuItemSelectors {
     }
 
     @objc func toggleBookmarkAsFavorite(_ sender: NSMenuItem) {
-        guard let bookmark = sender.representedObject as? Bookmark else {
+        if let bookmark = sender.representedObject as? Bookmark{
+            bookmark.isFavorite.toggle()
+            bookmarkManager.update(bookmark: bookmark)
+        } else if let bookmarks = sender.representedObject as? [Bookmark] {
+            bookmarks.forEach { bookmark in
+                bookmark.isFavorite.toggle()
+                bookmarkManager.update(bookmark: bookmark)
+            }
+        } else {
             assertionFailure("Failed to cast menu represented object to Bookmark")
-            return
         }
-
-        bookmark.isFavorite.toggle()
-        bookmarkManager.update(bookmark: bookmark)
     }
 
     @MainActor
@@ -424,16 +428,20 @@ extension BookmarksContextMenu: FolderMenuItemSelectors {
 
     @MainActor
     @objc func openInNewTabs(_ sender: NSMenuItem) {
-        guard let tabCollection = windowControllersManager.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel,
-              let folder = sender.representedObject as? BookmarkFolder
-        else {
+        guard let tabCollection = windowControllersManager.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel else {
             assertionFailure("Cannot open all in new tabs")
             return
         }
 
-        let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
-        tabCollection.append(tabs: tabs)
-        PixelExperiment.fireOnboardingBookmarkUsed5to7Pixel()
+        if let folder = sender.representedObject as? BookmarkFolder {
+            let tabs = Tab.withContentOfBookmark(folder: folder, burnerMode: tabCollection.burnerMode)
+            tabCollection.append(tabs: tabs)
+            PixelExperiment.fireOnboardingBookmarkUsed5to7Pixel()
+        } else if let bookmarks = sender.representedObject as? [Bookmark] {
+            let tabs = Tab.with(contentsOf: bookmarks, burnerMode: tabCollection.burnerMode)
+            tabCollection.append(tabs: tabs)
+            PixelExperiment.fireOnboardingBookmarkUsed5to7Pixel()
+        }
     }
 
     @MainActor

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -710,6 +710,7 @@ struct UserText {
 
     static let aboutDuckDuckGo = NSLocalizedString("preferences.about.about-duckduckgo", value: "About DuckDuckGo", comment: "About screen")
     static let duckduckgoTagline = NSLocalizedString("preferences.about.duckduckgo-tagline", value: "Your protection, our priority.", comment: "About screen")
+    static let setAsDefaultBrowser = NSLocalizedString("preferences.set-as-default", value: "Set DuckDuckGo As Default Browser", comment: "Menu option to set the browser as default")
     static let aboutUnsupportedDeviceInfo1 = NSLocalizedString("preferences.about.unsupported-device-info1", value: "DuckDuckGo is no longer providing browser updates for your version of macOS.", comment: "This string represents a message informing the user that DuckDuckGo is no longer providing browser updates for their version of macOS")
     static func aboutUnsupportedDeviceInfo2(version: String) -> String {
         let localized = NSLocalizedString("preferences.about.unsupported-device-info2", value: "Please update to macOS %@ or later to use the most recent version of DuckDuckGo. You can also keep using your current version of the browser, but it will not receive further updates.", comment: "Copy in section that tells the user to update their macOS version since their current version is unsupported")
@@ -1382,41 +1383,49 @@ struct UserText {
     // Comment: "Title for Freemium Personal Information Removal (Scan-Only) item in the options menu"
     static let freemiumDBPOptionsMenuItem = "Free Personal Information Scan"
 
-    // Key: "home.page.promotion.freemium.dbp.text"
-    // Comment: "Text for the Freemium DBP Home Page Promotion"
-    static let homePagePromotionFreemiumDBPText = "Find your personal info on sites that sell it."
+    // Key: "home.page.promotion.freemium.dbp.title"
+    // Comment: "Title for the Freemium DBP Home Page Promotion"
+    static let homePagePromotionFreemiumDBPTitle = "Personal Information Removal"
+
+    // Key: "home.page.promotion.freemium.dbp.description.markdown"
+    // Comment: "Markdown Description for the Freemium DBP Home Page Promotion"
+    static let homePagePromotionFreemiumDBPDescriptionMarkdown = "Find out which sites are selling **your info.**"
+
+    // Key: "home.page.promotion.freemium.dbp.description"
+    // Comment: "Description for the Freemium DBP Home Page Promotion"
+    static let homePagePromotionFreemiumDBPDescription = "Find out which sites are selling your info."
 
     // Key: "home.page.promotion.freemium.dbp.button.title"
     // Comment: "Title for the Freemium DBP Home Page Promotion Button"
     static let homePagePromotionFreemiumDBPButtonTitle = "Free Scan"
 
-    // Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.single.match.text"
-    // Comment: "Text for the Freemium DBP Home Page Post Scan Engagement Promotion When Only One Record is Found"
-    static let homePagePromotionFreemiumDBPPostScanEngagementResultSingleMatchText = "Your free personal info scan found 1 record about you on 1 site."
+    // Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.single.match.description"
+    // Comment: "Description for the Freemium DBP Home Page Post Scan Engagement Promotion When Only One Record is Found"
+    static let homePagePromotionFreemiumDBPPostScanEngagementResultSingleMatchDescription = "Your free personal info scan found 1 record about you on 1 site."
 
-    /// Generates Text for the Freemium DBP Home Page Post Scan Engagement Promotion when records are found on a single broker site.
-    /// Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.single.broker.text"
+    /// Generates Description for the Freemium DBP Home Page Post Scan Engagement Promotion when records are found on a single broker site.
+    /// Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.single.broker.description"
     ///
     /// - Parameter resultCount: The number of records found.
     /// - Returns: A formatted string indicating the number of records found on 1 site.
-    static func homePagePromotionFreemiumDBPPostScanEngagementResultSingleBrokerText(resultCount: Int) -> String {
+    static func homePagePromotionFreemiumDBPPostScanEngagementResultSingleBrokerDescription(resultCount: Int) -> String {
         String(format: "Your free personal info scan found %d records about you on 1 site.", resultCount)
     }
 
-    /// Generates Text for the Freemium DBP Home Page Post Scan Engagement Promotion when records are found on multiple broker sites.
-    /// Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.plural.text"
+    /// Generates Description for the Freemium DBP Home Page Post Scan Engagement Promotion when records are found on multiple broker sites.
+    /// Key: "home.page.promotion.freemium.dbp.post.scan.engagement.result.plural.description"
     ///
     /// - Parameters:
     ///   - resultCount: The number of records found.
     ///   - brokerCount: The number of broker sites where records were found.
     /// - Returns: A formatted string indicating the number of records found on multiple sites.
-    static func homePagePromotionFreemiumDBPPostScanEngagementResultPluralText(resultCount: Int, brokerCount: Int) -> String {
+    static func homePagePromotionFreemiumDBPPostScanEngagementResultPluralDescription(resultCount: Int, brokerCount: Int) -> String {
         String(format: "Your free personal info scan found %d records about you on %d different sites.", resultCount, brokerCount)
     }
 
-    // Key: "home.page.promotion.freemium.dbp.post.scan.engagement.no.results.text"
-    // Comment: "Text for the Freemium DBP Home Page Post Scan Engagement Promotion When There Are No Results"
-    static let homePagePromotionFreemiumDBPPostScanEngagementNoResultsText = "Good news, your free personal info scan didn't find any records about you. We'll keep checking periodically."
+    // Key: "home.page.promotion.freemium.dbp.post.scan.engagement.no.results.description"
+    // Comment: "Description for the Freemium DBP Home Page Post Scan Engagement Promotion When There Are No Results"
+    static let homePagePromotionFreemiumDBPPostScanEngagementNoResultsDescription = "Good news, your free personal info scan didn't find any records about you. We'll keep checking periodically."
 
     // Key: "home.page.promotion.freemium.dbp.post.scan.engagement.button.title"
     // Comment: "Title for the Freemium DBP Home Page Post Scan Engagement Promotion Button"

diff --git a/DuckDuckGo/Common/Logger+Multiple.swift b/DuckDuckGo/Common/Logger+Multiple.swift
@@ -28,4 +28,5 @@ extension Logger {
     static var tabSnapshots = { Logger(subsystem: "Tab Snapshots", category: "") }()
     static var tabLazyLoading = { Logger(subsystem: "Lazy Loading", category: "") }()
     static var updates = { Logger(subsystem: "Updates", category: "") }()
+    static var tabPreview = { Logger(subsystem: "Tab Preview", category: "") }()
 }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
@@ -40,7 +40,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerImmediateScansFinishedWithError(error: let error),
                     .ipcServerAppLaunchedXPCError(error: let error),
                     .ipcServerAppLaunchedScheduledScansFinishedWithError(error: let error):
-                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .ipcServerProfileSavedCalledByApp,
                     .ipcServerProfileSavedReceivedByAgent,
                     .ipcServerImmediateScansInterrupted,
@@ -50,7 +50,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerAppLaunchedScheduledScansBlocked,
                     .ipcServerAppLaunchedScheduledScansInterrupted,
                     .ipcServerAppLaunchedScheduledScansFinishedWithoutError:
-                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .parentChildMatches,
                     .optOutStart,
                     .optOutEmailGenerate,
@@ -121,7 +121,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .entitlementCheckValid,
                     .entitlementCheckInvalid,
                     .entitlementCheckError:
-                PixelKit.fire(event, frequency: .dailyAndCount)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount)
             }
         }
     }

diff --git a/DuckDuckGo/DuckDuckGoAppStore.entitlements b/DuckDuckGo/DuckDuckGoAppStore.entitlements
@@ -23,8 +23,6 @@
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-	<key>com.apple.security.device.usb</key>
-	<true/>
 	<key>com.apple.security.files.downloads.read-write</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>

diff --git a/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements b/DuckDuckGo/DuckDuckGoAppStoreCI.entitlements
@@ -16,8 +16,6 @@
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-	<key>com.apple.security.device.usb</key>
-	<true/>
 	<key>com.apple.security.files.downloads.read-write</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>

diff --git a/DuckDuckGo/DuckDuckGoAppStoreDebug.entitlements b/DuckDuckGo/DuckDuckGoAppStoreDebug.entitlements
@@ -21,8 +21,6 @@
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-	<key>com.apple.security.device.usb</key>
-	<true/>
 	<key>com.apple.security.files.downloads.read-write</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>

diff --git a/DuckDuckGo/Freemium/DBP/Extensions/PromotionView+FreemiumDBP.swift b/DuckDuckGo/Freemium/DBP/Extensions/PromotionView+FreemiumDBP.swift
@@ -22,11 +22,18 @@ extension PromotionViewModel {
     static func freemiumDBPPromotion(proceedAction: @escaping () -> Void,
                                      closeAction: @escaping () -> Void) -> PromotionViewModel {
 
-        let text = UserText.homePagePromotionFreemiumDBPText
+        let title = UserText.homePagePromotionFreemiumDBPTitle
+        var description = UserText.homePagePromotionFreemiumDBPDescription
+
+        if #available(macOS 12.0, *) {
+            description = UserText.homePagePromotionFreemiumDBPDescriptionMarkdown
+        }
+
         let actionButtonText = UserText.homePagePromotionFreemiumDBPButtonTitle
 
-        return PromotionViewModel(image: .radarCheck,
-                                  text: text,
+        return PromotionViewModel(image: .informationRemover128,
+                                  title: title,
+                                  description: description,
                                   proceedButtonText: actionButtonText,
                                   proceedAction: proceedAction,
                                   closeAction: closeAction)
@@ -37,22 +44,22 @@ extension PromotionViewModel {
                                                           proceedAction: @escaping () -> Void,
                                                           closeAction: @escaping () -> Void) -> PromotionViewModel {
 
-        var text = ""
+        var description = ""
 
         switch (resultCount, brokerCount) {
         case (1, _):
-            text = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultSingleMatchText
+            description = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultSingleMatchDescription
         case (let resultCount, 1):
-            text = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultSingleBrokerText(resultCount: resultCount)
+            description = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultSingleBrokerDescription(resultCount: resultCount)
         default:
-            text = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultPluralText(resultCount: resultCount,
+            description = UserText.homePagePromotionFreemiumDBPPostScanEngagementResultPluralDescription(resultCount: resultCount,
                                                                                                    brokerCount: brokerCount)
         }
 
         let actionButtonText = UserText.homePagePromotionFreemiumDBPPostScanEngagementButtonTitle
 
-        return PromotionViewModel(image: .radarCheck,
-                                  text: text,
+        return PromotionViewModel(image: .informationRemover128,
+                                  description: description,
                                   proceedButtonText: actionButtonText,
                                   proceedAction: proceedAction,
                                   closeAction: closeAction)
@@ -61,11 +68,11 @@ extension PromotionViewModel {
     static func freemiumDBPPromotionScanEngagementNoResults(proceedAction: @escaping () -> Void,
                                                             closeAction: @escaping () -> Void) -> PromotionViewModel {
 
-        let text = UserText.homePagePromotionFreemiumDBPPostScanEngagementNoResultsText
+        let description = UserText.homePagePromotionFreemiumDBPPostScanEngagementNoResultsDescription
         let actionButtonText = UserText.homePagePromotionFreemiumDBPPostScanEngagementButtonTitle
 
-        return PromotionViewModel(image: .radarCheck,
-                                  text: text,
+        return PromotionViewModel(image: .informationRemover128,
+                                  description: description,
                                   proceedButtonText: actionButtonText,
                                   proceedAction: proceedAction,
                                   closeAction: closeAction)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 298
		CURRENT_PROJECT_VERSION = 300