Merge branch 'release/1.118.0' into michal/update-pp-translations

.github/workflows/publish_dmg_release.yml

@@ -262,7 +262,8 @@ jobs:
             github_handle:"${{ github.actor }}" \
             is_scheduled_release:"${{ github.event_name == 'schedule' }}" \
             release_task_id:"${{ steps.task-id.outputs.asana_task_id }}" \
-            target_section_id:"${{ vars.MACOS_APP_BOARD_DONE_SECTION_ID }}"
+            target_section_id:"${{ vars.MACOS_APP_BOARD_DONE_SECTION_ID }}" \
+            tag:"${{ env.TAG }}"
 
       - name: Get tasks since last internal release
         id: get-tasks-since-last-internal-release

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 320
+CURRENT_PROJECT_VERSION = 325

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 1.117.0
+MARKETING_VERSION = 1.118.0

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "59f8fb2f850f8a0482c604d07396e01e8de59d21",
-        "version" : "216.0.1"
+        "revision" : "20df9e22d5a69acfc25204fb0228a9d6f79b721f",
+        "version" : "219.0.0"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
       "state" : {
-        "revision" : "c992041d16ec10d790e6204dce9abf9966d1363c",
-        "version" : "15.1.0"
+        "revision" : "88982a3802ac504e2f1a118a73bfdf2d8f4a7735",
+        "version" : "16.0.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"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme

@@ -271,6 +271,16 @@
                ReferencedContainer = "container:LocalPackages/AppKitExtensions">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NewTabPageTests"
+               BuildableName = "NewTabPageTests"
+               BlueprintName = "NewTabPageTests"
+               ReferencedContainer = "container:LocalPackages/NewTabPage">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -299,6 +309,10 @@
             argument = "-NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints YES"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-SUEnableAutomaticChecks NO"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "-com.apple.CoreData.ConcurrencyDebug 1"
             isEnabled = "YES">

DuckDuckGo/Application/AppDelegate.swift

@@ -29,8 +29,10 @@ import FeatureFlags
 import History
 import MetricKit
 import Networking
+import NewTabPage
 import Persistence
 import PixelKit
+import PixelExperimentKit
 import ServiceManagement
 import SyncDataProviders
 import UserNotifications
@@ -96,12 +98,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     private(set) lazy var newTabPageActionsManager: NewTabPageActionsManaging = NewTabPageActionsManager(
         appearancePreferences: .shared,
         activeRemoteMessageModel: activeRemoteMessageModel,
-        privacyStats: privacyStats,
-        openURLHandler: { url in
-            Task { @MainActor in
-                WindowControllersManager.shared.showTab(with: .contentFromURL(url, source: .appOpenUrl))
-            }
-        }
+        privacyStats: privacyStats
     )
     let privacyStats: PrivacyStatsCollecting
     let activeRemoteMessageModel: ActiveRemoteMessageModel
@@ -266,13 +263,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                     privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager
                 )
             )
-            activeRemoteMessageModel = ActiveRemoteMessageModel(remoteMessagingClient: remoteMessagingClient)
+            activeRemoteMessageModel = ActiveRemoteMessageModel(remoteMessagingClient: remoteMessagingClient, openURLHandler: { url in
+                WindowControllersManager.shared.showTab(with: .contentFromURL(url, source: .appOpenUrl))
+            })
         } else {
             // As long as remoteMessagingClient is private to App Delegate and activeRemoteMessageModel
             // is used only by HomePage RootView as environment object,
             // it's safe to not initialize the client for unit tests to avoid side effects.
             remoteMessagingClient = nil
-            activeRemoteMessageModel = ActiveRemoteMessageModel(remoteMessagingStore: nil, remoteMessagingAvailabilityProvider: nil)
+            activeRemoteMessageModel = ActiveRemoteMessageModel(
+                remoteMessagingStore: nil,
+                remoteMessagingAvailabilityProvider: nil,
+                openURLHandler: { _ in }
+            )
         }
 
         featureFlagger = DefaultFeatureFlagger(
@@ -282,7 +285,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 keyValueStore: UserDefaults.appConfiguration,
                 actionHandler: FeatureFlagOverridesPublishingHandler<FeatureFlag>()
             ),
-            experimentManager: ExperimentCohortsManager(store: ExperimentsDataStore()),
+            experimentManager: ExperimentCohortsManager(store: ExperimentsDataStore(), fireCohortAssigned: PixelKit.fireExperimentEnrollmentPixel(subfeatureID:experiment:)),
             for: FeatureFlag.self
         )
 
@@ -331,6 +334,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 #else
         privacyStats = PrivacyStats(databaseProvider: PrivacyStatsDatabase())
 #endif
+        PixelKit.configureExperimentKit(featureFlagger: featureFlagger, eventTracker: ExperimentEventTracker(store: UserDefaults.appConfiguration))
     }
 
     func applicationWillFinishLaunching(_ notification: Notification) {

DuckDuckGo/Autofill/ContentOverlayViewController.swift

@@ -39,9 +39,12 @@ public final class ContentOverlayViewController: NSViewController, EmailManagerR
         return emailManager
     }()
 
+    lazy var featureFlagger = NSApp.delegateTyped.featureFlagger
+
     lazy var vaultManager: SecureVaultManager = {
         let manager = SecureVaultManager(passwordManager: PasswordManagerCoordinator.shared,
                                          includePartialAccountMatches: true,
+                                         shouldAllowPartialFormSaves: featureFlagger.isFeatureOn(.autofillPartialFormSaves),
                                          tld: ContentBlocking.shared.tld)
         manager.delegate = self
         return manager

DuckDuckGo/Bookmarks/Model/BookmarkList.swift

@@ -44,7 +44,14 @@ struct BookmarkList {
 
     private(set) var allBookmarkURLsOrdered: [IdentifiableBookmark]
     private var favoriteBookmarksOrdered: [IdentifiableBookmark]
-    private var itemsDict: [String: [Bookmark]]
+    private var itemsDict: [String: [Bookmark]] {
+        didSet {
+            updateLowercasedItemsDict()
+        }
+    }
+
+    // Copy of itemsDict used for efficient lookups of variant URLs
+    private(set) var lowercasedItemsDict: [String: [Bookmark]] = [:]
 
     var totalBookmarks: Int {
         return allBookmarkURLsOrdered.count
@@ -76,6 +83,7 @@ struct BookmarkList {
         self.allBookmarkURLsOrdered = keysOrdered
         self.itemsDict = itemsDict
         self.topLevelEntities = topLevelEntities
+        updateLowercasedItemsDict()
     }
 
     mutating func insert(_ bookmark: Bookmark) {
@@ -149,6 +157,15 @@ struct BookmarkList {
         return allBookmarkURLsOrdered
     }
 
+    private mutating func updateLowercasedItemsDict() {
+        lowercasedItemsDict = itemsDict.reduce(into: [:]) { result, entry in
+            let lowercasedKey = entry.key.lowercased()
+            if result[lowercasedKey] == nil {
+                result[lowercasedKey] = entry.value
+            }
+        }
+    }
+
 }
 
 private extension BookmarkList {

DuckDuckGo/Bookmarks/Model/BookmarkManager.swift

@@ -182,14 +182,16 @@ final class LocalBookmarkManager: BookmarkManager {
 
     /// Finds a bookmark by checking all possible URL variants (http/https, trailing slash).
     private func findBookmark(forVariantUrl url: URL) -> Bookmark? {
-        let urlVariants = url.bookmarkButtonUrlVariants()
+        guard let list = list else {
+            return nil
+        }
 
-        for variant in urlVariants {
-            if let bookmark = getBookmark(for: variant) {
+        for variant in url.bookmarkButtonUrlVariants() {
+            let variantString = variant.absoluteString
+            if let bookmark = list.lowercasedItemsDict[variantString]?.first {
                 return bookmark
             }
         }
-
         return nil
     }
 
@@ -202,8 +204,6 @@ final class LocalBookmarkManager: BookmarkManager {
     }
 
     @discardableResult func makeBookmark(for url: URL, title: String, isFavorite: Bool, index: Int? = nil, parent: BookmarkFolder? = nil) -> Bookmark? {
-        assert(url.absoluteString.lowercased() == url.absoluteString)
-
         guard list != nil else { return nil }
 
         guard !isUrlBookmarked(url: url) else {

DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkDialogViewModel.swift

@@ -110,7 +110,7 @@ final class AddEditBookmarkDialogViewModel: BookmarkDialogEditing {
     }
 
     func addOrSave(dismiss: () -> Void) {
-        guard let url = bookmarkURLPath.lowercased().url else {
+        guard let url = bookmarkURLPath.url else {
             assertionFailure("Invalid URL, default action button should be disabled.")
             return
         }

DuckDuckGo/BookmarksBar/View/BookmarksBarMenuPopover.swift

@@ -150,10 +150,10 @@ extension BookmarksBarMenuPopover: BookmarksBarMenuViewControllerDelegate {
     }
 
     func popover(shouldPreventClosure: Bool) {
-        var popover: BookmarksBarMenuPopover! = self
-        while popover != nil {
+        var window = contentViewController?.view.window
+        while let popover = window?.contentViewController?.nextResponder as? Self {
             popover.behavior = shouldPreventClosure ? .applicationDefined : .transient
-            popover = mainWindow?.contentViewController?.nextResponder as? BookmarksBarMenuPopover
+            window = window?.parent
         }
     }
 

DuckDuckGo/Common/Extensions/FileManagerExtension.swift

@@ -22,6 +22,31 @@ import os.log
 
 extension FileManager {
 
+#if !SANDBOX_TEST_TOOL
+    func configurationDirectory() -> URL {
+        let fm = FileManager.default
+
+        guard let dir = fm.containerURL(forSecurityApplicationGroupIdentifier: Bundle.main.appGroup(bundle: .appConfiguration)) else {
+            fatalError("Failed to get application group URL")
+        }
+        let subDir = dir.appendingPathComponent("Configuration")
+
+        var isDir: ObjCBool = false
+        if !fm.fileExists(atPath: subDir.path, isDirectory: &isDir) || !isDir.boolValue {
+            if !isDir.boolValue {
+                try? fm.removeItem(at: subDir)
+            }
+            do {
+                try fm.createDirectory(at: subDir, withIntermediateDirectories: true, attributes: nil)
+                isDir = true
+            } catch {
+                fatalError("Failed to create directory at \(subDir.path)")
+            }
+        }
+        return subDir
+    }
+#endif
+
     @discardableResult
     func moveItem(at srcURL: URL, to destURL: URL, incrementingIndexIfExists flag: Bool, pathExtension: String? = nil) throws -> URL {
         guard srcURL != destURL else { return destURL }

DuckDuckGo/Common/Extensions/NSAttributedStringExtension.swift

@@ -17,6 +17,7 @@
 //
 
 import AppKit
+import Utilities
 
 typealias NSAttributedStringBuilder = ArrayBuilder<NSAttributedString>
 extension NSAttributedString {

DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift

@@ -26,29 +26,6 @@ extension NSMenuItem {
         return item
     }
 
-    convenience init(title string: String, action selector: Selector? = nil, target: AnyObject? = nil, keyEquivalent: NSEvent.KeyEquivalent = [], representedObject: Any? = nil, state: NSControl.StateValue = .off, items: [NSMenuItem]? = nil) {
-        self.init(title: string, action: selector, keyEquivalent: keyEquivalent.charCode)
-        if !keyEquivalent.modifierMask.isEmpty {
-            self.keyEquivalentModifierMask = keyEquivalent.modifierMask
-        }
-        self.target = target
-        self.representedObject = representedObject
-        self.state = state
-
-        if let items {
-            self.submenu = NSMenu(title: title, items: items)
-        }
-    }
-
-    convenience init(title string: String, action selector: Selector? = nil, target: AnyObject? = nil, keyEquivalent: NSEvent.KeyEquivalent = [], representedObject: Any? = nil, state: NSControl.StateValue = .off, @MenuBuilder items: () -> [NSMenuItem]) {
-        self.init(title: string, action: selector, target: target, keyEquivalent: keyEquivalent, representedObject: representedObject, state: state, items: items())
-    }
-
-    convenience init(action selector: Selector?) {
-        self.init()
-        self.action = selector
-    }
-
     convenience init(bookmarkViewModel: BookmarkViewModel) {
         self.init()
 
@@ -65,67 +42,4 @@ extension NSMenuItem {
         representedObject = bookmarkViewModels
         action = #selector(MainViewController.openAllInTabs(_:))
     }
-
-    convenience init(title: String) {
-        self.init(title: title, action: nil, keyEquivalent: "")
-    }
-
-    var topMenu: NSMenu? {
-        var menuItem = self
-        while let parent = menuItem.parent {
-            menuItem = parent
-        }
-
-        return menuItem.menu
-    }
-
-    func removeFromParent() {
-        parent?.submenu?.removeItem(self)
-    }
-
-    @discardableResult
-    func alternate() -> NSMenuItem {
-        self.isAlternate = true
-        return self
-    }
-
-    @discardableResult
-    func hidden() -> NSMenuItem {
-        self.isHidden = true
-        if !keyEquivalent.isEmpty {
-            self.allowsKeyEquivalentWhenHidden = true
-        }
-        return self
-    }
-
-    @discardableResult
-    func submenu(_ submenu: NSMenu) -> NSMenuItem {
-        self.submenu = submenu
-        return self
-    }
-
-    @discardableResult
-    func withImage(_ image: NSImage?) -> NSMenuItem {
-        self.image = image
-        return self
-    }
-
-    @discardableResult
-    func targetting(_ target: AnyObject) -> NSMenuItem {
-        self.target = target
-        return self
-    }
-
-    @discardableResult
-    func withSubmenu(_ submenu: NSMenu) -> NSMenuItem {
-        self.submenu = submenu
-        return self
-    }
-
-    @discardableResult
-    func withModifierMask(_ mask: NSEvent.ModifierFlags) -> NSMenuItem {
-        self.keyEquivalentModifierMask = mask
-        return self
-    }
-
 }