Merge branch 'develop' into sam/bookmarks-improvements-phase-1

# By Dominik Kapusta (5) and others # Via Dominik Kapusta (1) and GitHub (1) * develop: Use updated BSK branch (#627) Version 0.26.5 Embedded files updated Update BSK for iOS app group (#630) Recently Closed Menu Item (#617) Close dashboard when closing tab with cmd + w (#628) chore(deps): bump Autofill to 4.7.0 (#631) Handle legacy crash logs and use proper architecture in symbolicate.js (#621) Detect when Chrome login fails due to keychain prompt denial (#633) Correctly display unprotected sites on dashboard (#624) Update homefavicon (#625) Update sparkle-sandbox.sh README to highlight proper usage Replace altool with notarytool in release build script (#623) Update embedded data Bump version to 0.26.4 Update homepage history feed after burning (#620) Firefox data import improvements (#622) Set version to 0.26.3 # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj
duckduckgo · Jul 1, 2022 · 88f1098 · 88f1098
2 parents d14670f + 906aac4
commit 88f1098
Show file tree

Hide file tree

Showing 66 changed files with 15,074 additions and 9,927 deletions.
diff --git a/.github/workflows/release.yml b/.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 }}

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo/App Delegate/AppDelegate.swift b/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

diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/Contents.json b/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"
     }

diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon.png b/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon.png
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon@2x.png b/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon@2x.png
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon@3x.png b/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/HomeFavicon@3x.png
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/ddg 2.png b/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/ddg 2.png
diff --git a/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/ddg 2@2x.png b/DuckDuckGo/Assets.xcassets/Images/HomeFavicon.imageset/ddg 2@2x.png
diff --git a/DuckDuckGo/Autofill/ContentOverlayViewController.swift b/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

diff --git a/DuckDuckGo/Bookmarks/ViewModel/BookmarkViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/BookmarkViewModel.swift
@@ -35,10 +35,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))
         }
 
     }

diff --git a/DuckDuckGo/Browser Tab/Model/Tab.swift b/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)

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/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: "")
+
 }
diff --git a/DuckDuckGo/Content Blocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/Content Blocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"bc13e454cd4a8a96b9ed56ea954c8665\""
-        public static let embeddedDataSHA = "49837e943dac5ab96ae37f18d04ea233344ae7b9bb6401dea0d277962952b6c1"
+        public static let embeddedDataETag = "\"33e237e968fa2c4135fbb08a787e0569\""
+        public static let embeddedDataSHA = "7d9719337c87d83e7fea43bc5a212e26392abc6ed5380b9f8b3069aedead61b2"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/Content Blocker/AppTrackerDataSetProvider.swift b/DuckDuckGo/Content Blocker/AppTrackerDataSetProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"c46161eb7f1e9f74958f1c861b1d8433\""
-        public static let embeddedDataSHA = "5ee435350af5fb3c713a8d03f9a2df730fabc5a6446567b4b0c1793a191b160d"
+        public static let embeddedDataETag = "\"11ea013202ceaa6903aa6eb4ed3b7a84\""
+        public static let embeddedDataSHA = "07919803196090e88f1a556d849fb281dcfbb7a25683efa36a80cb2c306ba2ef"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/Content Blocker/macos-config.json b/DuckDuckGo/Content Blocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1653680846662,
+    "version": 1656516173849,
     "features": {
         "ampLinks": {
             "exceptions": [
@@ -167,6 +167,10 @@
                         "domain": "sovietgames.su",
                         "reason": "Wordpress plugin reports our browser as a bot"
                     },
+                    {
+                        "domain": "thingiverse.com",
+                        "reason": "Site loads blank"
+                    },
                     {
                         "domain": "accounts.google.com",
                         "reason": "Site reports browser not supported"
@@ -205,6 +209,14 @@
             "exceptions": [
                 {
                     "domain": "adidas.com",
+                    "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",
                     "reason": "Broken add to cart"
                 },
                 {
@@ -409,6 +421,17 @@
                             }
                         ]
                     },
+                    "aldi-digital.co.uk": {
+                        "rules": [
+                            {
+                                "rule": "assets.aldi-digital.co.uk/assets/050b4966c22c430e5c9308903ebb87e1/dist/scripts/main.js",
+                                "domains": [
+                                    "aldi.co.uk"
+                                ],
+                                "reason": "product images missing"
+                            }
+                        ]
+                    },
                     "alicdn.com": {
                         "rules": [
                             {
@@ -495,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",
@@ -555,6 +579,39 @@
                             }
                         ]
                     },
+                    "facebook.net": {
+                        "rules": [
+                            {
+                                "rule": "connect.facebook.net/en_US/sdk.js",
+                                "domains": [
+                                    "grubhub.com"
+                                ],
+                                "reason": "broken login"
+                            }
+                        ]
+                    },
+                    "fwmrm.net": {
+                        "rules": [
+                            {
+                                "rule": "2a7e9.v.fwmrm.net/ad/g/1",
+                                "domains": [
+                                    "channel4.com"
+                                ],
+                                "reason": "adwall"
+                            }
+                        ]
+                    },
+                    "gigya.com": {
+                        "rules": [
+                            {
+                                "rule": "gigya.com/js/gigya.services.plugins.base.min.js",
+                                "domains": [
+                                    "<all>"
+                                ],
+                                "reason": "login content not loading"
+                            }
+                        ]
+                    },
                     "google-analytics.com": {
                         "rules": [
                             {
@@ -597,10 +654,11 @@
                                 "rule": "googletagmanager.com/gtm.js",
                                 "domains": [
                                     "ah.nl",
+                                    "dailyherald.com",
                                     "iltalehti.fi",
                                     "rbcroyalbank.com"
                                 ],
-                                "reason": "page not loading, video not loading, internal ads blocked"
+                                "reason": "page/video/image not loading, internal ads blocked"
                             }
                         ]
                     },
@@ -730,6 +788,17 @@
                             }
                         ]
                     },
+                    "tiqcdn.com": {
+                        "rules": [
+                            {
+                                "rule": "tags.tiqcdn.com/utag/agl/community/prod/utag.sync.js",
+                                "domains": [
+                                    "agl.com.au"
+                                ],
+                                "reason": "site loading delayed"
+                            }
+                        ]
+                    },
                     "twitter.com": {
                         "rules": [
                             {
@@ -801,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"
@@ -817,10 +882,6 @@
                         "domain": "apis.google.com",
                         "reason": "Site breakage"
                     },
-                    {
-                        "domain": "pay.google.com",
-                        "reason": "Site breakage"
-                    },
                     {
                         "domain": "payments.amazon.com",
                         "reason": "Site breakage"