Merge branch 'main' into sam/add-netp-subscription-auth-support

# By Diego Rey Mendez (4) and others
# Via Fernando Bunn (2) and GitHub (1)
* main:
  Adds option + click support for our VPN menu to show some useful debu… (#2007)
  Update latency & tunnel failure monitor implementation (#2005)
  Prevents VPNSettings from reporting fake changes (#2004)
  Updates the copy for the VPN status bar item context menu (#2003)
  Implement subscription purchase (#1906)
  DBP: Add m_mac prefix to Pixels (#1952)
  Bump version to 1.69.0 (96)
  Update embedded files
  Update Link Tracking Protection to preserve headers (#1965)
  VPN menus improvements (#1979)
  Data Import ux redo (#1754)
  Fix: "SwiftLintPlugin" must be enabled before it can be used (#1987)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift

Configuration/App/DuckDuckGoPrivacyPro.xcconfig

@@ -21,5 +21,6 @@
 
 #include "DuckDuckGo.xcconfig"
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION SPARKLE SUBSCRIPTION DBP
+FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION SPARKLE SUBSCRIPTION DBP STRIPE
 PRODUCT_NAME = $(PRODUCT_NAME_PREFIX) Privacy Pro
+PRODUCT_MODULE_NAME = DuckDuckGo_Privacy_Browser

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 95
+CURRENT_PROJECT_VERSION = 96

Configuration/Global.xcconfig

@@ -101,3 +101,10 @@ DDG_SLOW_COMPILE_CHECK_THRESHOLD[config=CI] = 250
 DDG_SLOW_COMPILE_CHECK = -Xfrontend -warn-long-expression-type-checking=$(DDG_SLOW_COMPILE_CHECK_THRESHOLD) -Xfrontend -warn-long-function-bodies=$(DDG_SLOW_COMPILE_CHECK_THRESHOLD)
 OTHER_SWIFT_FLAGS[config=Debug][arch=*][sdk=*] = $(inherited) $(DDG_SLOW_COMPILE_CHECK)
 OTHER_SWIFT_FLAGS[config=CI][arch=*][sdk=*] = $(inherited) $(DDG_SLOW_COMPILE_CHECK)
+
+// Automatically generate Color and Image asset accessor extensions
+ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES
+
+// Automatically generate localization string catalogs
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
+SWIFT_EMIT_LOC_STRINGS = YES

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

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "branch" : "sam/add-netp-subscription-auth-support",
-        "revision" : "a2e41dbf95c49f66120497002c680b929e969f97"
+        "revision" : "18043cbc24e5bb79aa1f44e01a367e0bccd2fa6e",
+        "version" : "99.0.2"
       }
     },
     {

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

@@ -54,7 +54,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <PreActions>
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">

DuckDuckGo/Application/AppDelegate.swift

@@ -34,6 +34,10 @@ import UserNotifications
 import NetworkProtection
 #endif
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 @MainActor
 final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDelegate {
 
@@ -263,6 +267,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
 #if DBP
         DataBrokerProtectionAppEvents().applicationDidFinishLaunching()
 #endif
+
+#if SUBSCRIPTION
+        Task {
+    #if STRIPE
+            SubscriptionPurchaseEnvironment.current = .stripe
+    #else
+            SubscriptionPurchaseEnvironment.current = .appStore
+    #endif
+            await AccountManager().checkSubscriptionState()
+        }
+#endif
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {

DuckDuckGo/Assets.xcassets/Images/Import-Export-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Import-Export-16D.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Menu-Hamburger-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu-Hamburger-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Menu-Horizontal-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Menu-Vertical-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu-Vertical-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Bookmarks/Model/BookmarkManager.swift

@@ -43,7 +43,7 @@ protocol BookmarkManager: AnyObject {
     func canMoveObjectWithUUID(objectUUID uuid: String, to parent: BookmarkFolder) -> Bool
     func move(objectUUIDs: [String], toIndex: Int?, withinParentFolder: ParentFolderType, completion: @escaping (Error?) -> Void)
     func moveFavorites(with objectUUIDs: [String], toIndex: Int?, completion: @escaping (Error?) -> Void)
-    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult
+    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary
 
     func handleFavoritesAfterDisablingSync()
 
@@ -313,7 +313,7 @@ final class LocalBookmarkManager: BookmarkManager {
 
     // MARK: - Import
 
-    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult {
+    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary {
         let results = bookmarkStore.importBookmarks(bookmarks, source: source)
         loadBookmarks()
         requestSync()

DuckDuckGo/Bookmarks/Services/BookmarkStore.swift

@@ -30,12 +30,12 @@ enum ParentFolderType {
     case parent(uuid: String)
 }
 
-struct BookmarkImportResult: Equatable {
+struct BookmarksImportSummary: Equatable {
     var successful: Int
     var duplicates: Int
     var failed: Int
 
-    static func += (left: inout BookmarkImportResult, right: BookmarkImportResult) {
+    static func += (left: inout BookmarksImportSummary, right: BookmarksImportSummary) {
         left.successful += right.successful
         left.duplicates += right.duplicates
         left.failed += right.failed
@@ -57,7 +57,7 @@ protocol BookmarkStore {
     func canMoveObjectWithUUID(objectUUID uuid: String, to parent: BookmarkFolder) -> Bool
     func move(objectUUIDs: [String], toIndex: Int?, withinParentFolder: ParentFolderType, completion: @escaping (Error?) -> Void)
     func moveFavorites(with objectUUIDs: [String], toIndex: Int?, completion: @escaping (Error?) -> Void)
-    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult
+    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary
 
     func handleFavoritesAfterDisablingSync()
 }

DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift

@@ -110,9 +110,9 @@ public final class BookmarkStoreMock: BookmarkStore {
     }
 
     var importBookmarksCalled = false
-    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult {
+    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary {
         importBookmarksCalled = true
-        return BookmarkImportResult(successful: 0, duplicates: 0, failed: 0)
+        return BookmarksImportSummary(successful: 0, duplicates: 0, failed: 0)
     }
 
     var canMoveObjectWithUUIDCalled = false

DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift

@@ -705,8 +705,8 @@ final class LocalBookmarkStore: BookmarkStore {
     /// 2. **Safari:** Create a root level "Imported Favorites" folder to store bookmarks from the bookmarks bar, and all other bookmarks go at the root level.
     /// 3. **Chrome:** Put all bookmarks at the root level, except for Other Bookmarks which go in a root level "Other Bookmarks" folder.
     /// 4. **Firefox:** Put all bookmarks at the root level, except for Other Bookmarks which go in a root level "Other Bookmarks" folder.
-    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult {
-        var total = BookmarkImportResult(successful: 0, duplicates: 0, failed: 0)
+    func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary {
+        var total = BookmarksImportSummary(successful: 0, duplicates: 0, failed: 0)
 
         do {
             let context = makeContext()
@@ -747,15 +747,15 @@ final class LocalBookmarkStore: BookmarkStore {
     private func createEntitiesFromBookmarks(allFolders: [BookmarkEntity],
                                              bookmarks: ImportedBookmarks,
                                              importSourceName: String,
-                                             in context: NSManagedObjectContext) -> BookmarkImportResult {
+                                             in context: NSManagedObjectContext) -> BookmarksImportSummary {
 
         guard let root = bookmarksRoot(in: context) else {
             return .init(successful: 0,
                          duplicates: 0,
                          failed: bookmarks.numberOfBookmarks)
         }
 
-        var total = BookmarkImportResult(successful: 0, duplicates: 0, failed: 0)
+        var total = BookmarksImportSummary(successful: 0, duplicates: 0, failed: 0)
 
         var parent = root
         var makeFavorties = true
@@ -791,8 +791,8 @@ final class LocalBookmarkStore: BookmarkStore {
     private func recursivelyCreateEntities(from bookmarks: [ImportedBookmarks.BookmarkOrFolder],
                                            parent: BookmarkEntity,
                                            markBookmarksAsFavorite: Bool? = false,
-                                           in context: NSManagedObjectContext) -> BookmarkImportResult {
-        var total = BookmarkImportResult(successful: 0, duplicates: 0, failed: 0)
+                                           in context: NSManagedObjectContext) -> BookmarksImportSummary {
+        var total = BookmarksImportSummary(successful: 0, duplicates: 0, failed: 0)
 
         let favoritesFolders = BookmarkUtils.fetchFavoritesFolders(for: favoritesDisplayMode, in: context)
 

DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift

@@ -173,7 +173,7 @@ final class BookmarkListViewController: NSViewController {
     }
 
     @IBAction func onImportClicked(_ sender: NSButton) {
-        DataImportViewController.show()
+        DataImportView.show()
     }
 
     // MARK: NSOutlineView Configuration

DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift

@@ -125,7 +125,7 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
     }
 
     @IBAction func onImportClicked(_ sender: NSButton) {
-        DataImportViewController.show()
+        DataImportView.show()
     }
 
     @IBAction func handleDoubleClick(_ sender: NSTableView) {

DuckDuckGo/Common/Extensions/NSColorExtension.swift

@@ -74,10 +74,6 @@ extension NSColor {
         NSColor(named: "FindInPageFocusedBackgroundColor")!
     }
 
-    static var inactiveSearchBarBackground: NSColor {
-        NSColor(named: "InactiveSearchBarBackground")!
-    }
-
     static var suggestionTextColor: NSColor {
         NSColor(named: "SuggestionTextColor")!
     }
@@ -138,14 +134,6 @@ extension NSColor {
         NSColor(named: "DialogPanelBackground")!
     }
 
-    static let bookmarkFilledTint = NSColor(named: "BookmarkFilledTint")!
-
-    static let bookmarkRepresentingColor1 = NSColor(named: "BookmarkRepresentingColor1")!
-    static let bookmarkRepresentingColor2 = NSColor(named: "BookmarkRepresentingColor2")!
-    static let bookmarkRepresentingColor3 = NSColor(named: "BookmarkRepresentingColor3")!
-    static let bookmarkRepresentingColor4 = NSColor(named: "BookmarkRepresentingColor4")!
-    static let bookmarkRepresentingColor5 = NSColor(named: "BookmarkRepresentingColor5")!
-
     static var buttonMouseDownColor: NSColor {
         NSColor(named: "ButtonMouseDownColor")!
     }

DuckDuckGo/Common/Extensions/NSOpenPanelExtensions.swift

@@ -33,14 +33,13 @@ extension NSOpenPanel {
         return panel
     }
 
-    static func filePanel(allowedExtension: String) -> NSOpenPanel {
-        let panel = NSOpenPanel()
-
-        panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Desktop")
-        panel.canChooseFiles = true
-        panel.allowedContentTypes = UTType(filenameExtension: allowedExtension).map { [$0] } ?? []
-        panel.canChooseDirectories = false
+    convenience init(allowedFileTypes: [UTType], directoryURL: URL? = nil) {
+        self.init()
 
-        return panel
+        self.directoryURL = directoryURL
+        canChooseFiles = true
+        allowedContentTypes = allowedFileTypes
+        canChooseDirectories = false
     }
+
 }

DuckDuckGo/Common/Extensions/NSWorkspaceExtension.swift

@@ -58,4 +58,12 @@ extension NSWorkspace {
         return missionControlWindows.count > allScreenSizes.count
     }
 
+    @available(macOS, obsoleted: 14.0, message: "This needs to be removed as it‘s no longer necessary.")
+    @nonobjc func urls(forApplicationsWithBundleId bundleId: String) -> [URL] {
+        if #available(macOS 12.0, *) {
+            return self.urlsForApplications(withBundleIdentifier: bundleId)
+        }
+        return LSCopyApplicationURLsForBundleIdentifier(bundleId as CFString, nil)?.takeRetainedValue() as? [URL] ?? []
+    }
+
 }

DuckDuckGo/Common/Extensions/SetExtension.swift

@@ -32,3 +32,11 @@ extension Set where Element == String {
     }
 
 }
+
+extension Set {
+
+    @inlinable func intersects<S: Sequence>(_ other: S) -> Bool where Element == S.Element {
+        !isDisjoint(with: other)
+    }
+
+}