Merge branch 'release/0.26.5'

.github/workflows/release.yml

@@ -75,7 +75,7 @@ jobs:
         submodules: recursive
 
     - name: Install create-dmg
-      if: github.event.inputs.create-dmg || github.event.inputs.asana-task-url
+      if: ${{ github.event.inputs.create-dmg == true || github.event.inputs.asana-task-url }}
       run: |
         brew install create-dmg
         echo "create_dmg_arg=-d" >> $GITHUB_ENV
@@ -89,11 +89,16 @@ jobs:
 
     - name: Archive and notarize the app
       env:
-        XCODE_DEVELOPER_APPLE_ID: ${{ secrets.XCODE_DEVELOPER_APPLE_ID }}
-        XCODE_DEVELOPER_PASSWORD: ${{ secrets.XCODE_DEVELOPER_PASSWORD }}
+        APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
+        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+        APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
         ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
         ASANA_COMMA_SEPARATED_TASK_NAMES_TO_BE_CLOSED: ${{ secrets.ASANA_COMMA_SEPARATED_TASK_NAMES_TO_BE_CLOSED }}
       run: |
+        # import API Key from secrets
+        export APPLE_API_KEY_PATH="$RUNNER_TEMP/apple_api_key.pem"
+        echo -n "$APPLE_API_KEY_BASE64" | base64 --decode --output $APPLE_API_KEY_PATH
+
         ./scripts/archive.sh ${{ github.event.inputs.release-type }} \
             ${{ env.create_dmg_arg }} \
             ${{ env.asana_task_url_arg }}

DuckDuckGo/App Delegate/AppDelegate.swift

@@ -89,8 +89,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         PrivacyFeatures.httpsUpgrade.loadDataAsync()
         LocalBookmarkManager.shared.loadBookmarks()
         FaviconManager.shared.loadFavicons()
-        _=ConfigurationManager.shared
-        _=DownloadListCoordinator.shared
+        _ = ConfigurationManager.shared
+        _ = DownloadListCoordinator.shared
+        _ = RecentlyClosedCoordinator.shared
 
         AtbAndVariantCleanup.cleanup()
         DefaultVariantManager().assignVariantIfNeeded { _ in

DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/Contents.json

@@ -1,16 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "ddg 2.png",
+      "filename" : "HomeFavicon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ddg 2@2x.png",
+      "filename" : "HomeFavicon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "HomeFavicon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DuckDuckGo/Autofill/ContentOverlayViewController.swift

@@ -191,6 +191,10 @@ extension ContentOverlayViewController: OverlayAutofillUserScriptPresentationDel
 }
 
 extension ContentOverlayViewController: SecureVaultManagerDelegate {
+
+    public func secureVaultManagerIsEnabledStatus(_: SecureVaultManager) -> Bool {
+        return true
+    }
 
     public func secureVaultManager(_: SecureVaultManager, promptUserToStoreAutofillData data: AutofillData) {
         // No-op, the content overlay view controller should not be prompting the user to store data

DuckDuckGo/Bookmarks/ViewModel/BookmarkViewModel.swift

@@ -22,7 +22,6 @@ struct BookmarkViewModel {
 
     let entity: BaseBookmarkEntity
 
-    static let maxMenuTitleLength = 55
     var menuTitle: String {
         let title: String
 
@@ -34,10 +33,10 @@ struct BookmarkViewModel {
             preconditionFailure("\(#file): Failed to case BaseBookmarkEntity to Bookmark or Folder")
         }
 
-        if title.count <= Self.maxMenuTitleLength {
+        if title.count <= MainMenu.Constants.maxTitleLength {
             return title
         } else {
-            return String(title.truncated(length: Self.maxMenuTitleLength))
+            return String(title.truncated(length: MainMenu.Constants.maxTitleLength))
         }
 
     }

DuckDuckGo/Browser Tab/Model/Tab.swift

@@ -866,6 +866,10 @@ extension Tab: SurrogatesUserScriptDelegate {
 extension Tab: EmailManagerRequestDelegate { }
 
 extension Tab: SecureVaultManagerDelegate {
+
+    public func secureVaultManagerIsEnabledStatus(_: SecureVaultManager) -> Bool {
+        return true
+    }
 
     func secureVaultManager(_: SecureVaultManager, promptUserToStoreAutofillData data: AutofillData) {
         delegate?.tab(self, requestedSaveAutofillData: data)

DuckDuckGo/Common/Localizables/UserText.swift

@@ -491,4 +491,10 @@ struct UserText {
     static let autoconsentPopupLaterButton = NSLocalizedString("Not Now", comment: "")
     static let autoconsentPopupNeverButton = NSLocalizedString("Don't Ask Again", comment: "")
 
+    static let recentlyClosedMenuItemSuffixOne = NSLocalizedString("one.more.tab", value: " (and 1 more tab)", comment: "suffix of string in Recently Closed menu")
+    static let recentlyClosedMenuItemSuffixMultiple = NSLocalizedString("n.more.tabs", value: " (and %d more tabs)", comment: "suffix of string in Recently Closed menu")
+
+    static let reopenLastClosedTab = NSLocalizedString("reopen.last.closed.tab", value: "Reopen Last Closed Tab", comment: "")
+    static let reopenLastClosedWindow = NSLocalizedString("reopen.last.closed.window", value: "Reopen Last Closed Window", comment: "")
+
 }

DuckDuckGo/Content Blocker/AppPrivacyConfigurationDataProvider.swift

@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"c121a1662102066d548a8ee2fa2476c0\""
-        public static let embeddedDataSHA = "e689bf975adfccec727633fdafe0c9f4ced679874561008d2a22704ea96ea798"
+        public static let embeddedDataETag = "\"33e237e968fa2c4135fbb08a787e0569\""
+        public static let embeddedDataSHA = "7d9719337c87d83e7fea43bc5a212e26392abc6ed5380b9f8b3069aedead61b2"
     }
 
     var embeddedDataEtag: String {

DuckDuckGo/Content Blocker/AppTrackerDataSetProvider.swift

@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"383adacefeaf6fdd2c4ea9bfd661bb3f\""
-        public static let embeddedDataSHA = "1c9b2630d753f9c027de903e11f2221358489e2e02adf737a732152938d17949"
+        public static let embeddedDataETag = "\"11ea013202ceaa6903aa6eb4ed3b7a84\""
+        public static let embeddedDataSHA = "07919803196090e88f1a556d849fb281dcfbb7a25683efa36a80cb2c306ba2ef"
     }
 
     var embeddedDataEtag: String {

DuckDuckGo/Content Blocker/macos-config.json

@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1655989238391,
+    "version": 1656516173849,
     "features": {
         "ampLinks": {
             "exceptions": [
@@ -209,7 +209,11 @@
             "exceptions": [
                 {
                     "domain": "adidas.com",
-                    "reason": "Broken add to cart"
+                    "reason": "When adding an item to the cart, there is an error 'An unexpected problem occurred' and the item is not added to the cart."
+                },
+                {
+                    "domain": "adidas.co.uk",
+                    "reason": "When adding an item to the cart, there is an error 'An unexpected problem occurred' and the item is not added to the cart."
                 },
                 {
                     "domain": "hm.com",
@@ -514,9 +518,10 @@
                             {
                                 "rule": "pubads.g.doubleclick.net/gampad/ads",
                                 "domains": [
-                                    "nhl.com"
+                                    "nhl.com",
+                                    "viki.com"
                                 ],
-                                "reason": "videos not loading"
+                                "reason": "nhl.com - videos not loading; viki.com - after a video has played for a few seconds an adwall pops up. Clicking 'I've turned off my adblocker' resets the video, then after a few seconds the adwall pops up again."
                             },
                             {
                                 "rule": "securepubads.g.doubleclick.net/tag/js/gpt.js",
@@ -865,10 +870,6 @@
                         "domain": "docs.google.com",
                         "reason": "Site breakage"
                     },
-                    {
-                        "domain": "accounts.google.com",
-                        "reason": "SSO which needs cookies for auth"
-                    },
                     {
                         "domain": "googleapis.com",
                         "reason": "Site breakage"
@@ -881,10 +882,6 @@
                         "domain": "apis.google.com",
                         "reason": "Site breakage"
                     },
-                    {
-                        "domain": "pay.google.com",
-                        "reason": "Site breakage"
-                    },
                     {
                         "domain": "payments.amazon.com",
                         "reason": "Site breakage"