Add Phishing Detection Interface Elements

.github/actions/asana-get-release-automation-subtask-id/action.yml

@@ -15,7 +15,7 @@ outputs:
     value: ${{ steps.extract-automation-task-id.outputs.automation-task-id }}
   assignee-id:
     description: "Release task assignee ID"
-    value: ${{ steps.extract-assignee-id.outputs.assignee-id }}
+    value: ${{ steps.extract-assignee-id.outputs.asana_assignee_id }}
 runs:
   using: "composite"
   steps:
@@ -24,10 +24,10 @@ runs:
       run: bundle exec fastlane run asana_extract_task_id task_url:"${{ inputs.task-url }}"
 
     - id: extract-assignee-id
-      uses: ./.github/actions/asana-extract-task-assignee
-      with:
-        task-id: ${{ steps.extract-task-id.outputs.asana_task_id }}
-        access-token: ${{ inputs.access-token }}
+      shell: bash
+      env:
+        ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
+      run: bundle exec fastlane run asana_extract_task_assignee task_id:"${{ steps.extract-task-id.outputs.asana_task_id }}"
 
     - id: extract-automation-task-id
       run: |

.github/workflows/pr.yml

@@ -297,6 +297,7 @@ jobs:
       with:
         check_name: "Test Report: ${{ matrix.flavor }}"
         report_paths: '${{ matrix.flavor }}*.xml'
+        check_retries: true
 
     - name: Update Asana with failed unit tests
       if: always() # always run even if the previous step fails

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 250
+CURRENT_PROJECT_VERSION = 251

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

@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "4a55217003ad7b2d44a1ac616d47596c0bda69dc",
-        "version" : "186.0.0"
+        "revision" : "ac53011582abcca4aefd66f15308332273eecb49",
+        "version" : "190.0.0"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "f97053d24c21ea301d4067adbbe0899ff940526a",
-        "version" : "6.7.0"
+        "revision" : "5876a5d2e2e7f5a2e11f6419c6c3fafb7cafdfca",
+        "version" : "6.12.0"
       }
     },
     {
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "36dc07cba4bc1e7e0c1d1fb679c3cd077694a072",
-        "version" : "5.0.0"
+        "revision" : "665b23dc656c9f787494620494f8e56098a900b2",
+        "version" : "5.1.1"
       }
     },
     {

DuckDuckGo/Application/AppDelegate.swift

@@ -39,6 +39,7 @@ import Subscription
 import NetworkProtectionIPC
 import DataBrokerProtection
 import RemoteMessaging
+import os.log
 
 final class AppDelegate: NSObject, NSApplicationDelegate {
 
@@ -65,7 +66,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     let fileStore: FileStore
 
 #if APPSTORE
-    private let crashCollection = CrashCollection(platform: .macOSAppStore, log: .default)
+    private let crashCollection = CrashCollection(platform: .macOSAppStore)
 #else
     private let crashReporter = CrashReporter()
 #endif
@@ -164,7 +165,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             let encryptionKey = NSApplication.runType.requiresEnvironment ? try keyStore.readKey() : nil
             fileStore = EncryptedFileStore(encryptionKey: encryptionKey)
         } catch {
-            os_log("App Encryption Key could not be read: %s", "\(error)")
+            Logger.general.error("App Encryption Key could not be read: \(error.localizedDescription)")
             fileStore = EncryptedFileStore()
         }
 
@@ -545,7 +546,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             dataProvidersSource: syncDataProviders,
             errorEvents: SyncErrorHandler(),
             privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
-            log: OSLog.sync,
             environment: environment
         )
         syncService.initializeIfNeeded()
@@ -620,10 +620,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                     return
                 }
                 if isLocked {
-                    os_log(.debug, log: .sync, "Screen is locked")
+                    Logger.sync.debug("Screen is locked")
                     syncService.scheduler.cancelSyncAndSuspendSyncQueue()
                 } else {
-                    os_log(.debug, log: .sync, "Screen is unlocked")
+                    Logger.sync.debug("Screen is unlocked")
                     syncService.scheduler.resumeSyncQueue()
                 }
             }

DuckDuckGo/Application/DockCustomizer.swift

@@ -18,6 +18,7 @@
 
 import Foundation
 import Common
+import os.log
 
 protocol DockCustomization {
     var isAddedToDock: Bool { get }
@@ -104,7 +105,7 @@ final class DockCustomizer: DockCustomization {
             }
             return true
         } catch {
-            os_log(.error, "Error writing to Dock plist: %{public}@", error.localizedDescription)
+            Logger.general.error("Error writing to Dock plist: \(error.localizedDescription, privacy: .public)")
             return false
         }
     }

DuckDuckGo/Application/URLEventHandler.swift

@@ -24,6 +24,8 @@ import Subscription
 import NetworkProtectionUI
 import VPNAppLauncher
 import DataBrokerProtection
+import os.log
+import BrowserServicesKit
 
 // @MainActor
 final class URLEventHandler {
@@ -64,14 +66,14 @@ final class URLEventHandler {
 
     @objc func handleUrlEvent(event: NSAppleEventDescriptor, reply: NSAppleEventDescriptor) {
         guard let stringValue = event.paramDescriptor(forKeyword: keyDirectObject)?.stringValue else {
-            os_log("UrlEventListener: unable to determine path", type: .error)
+            Logger.general.error("UrlEventListener: unable to determine path")
             let error = NSError(domain: "CouldNotGetPath", code: -1, userInfo: nil)
             PixelKit.fire(DebugEvent(GeneralPixel.appOpenURLFailed, error: error))
             return
         }
 
         guard let url = URL.makeURL(from: stringValue) else {
-            os_log("UrlEventListener: failed to construct URL from path %s", type: .error, stringValue)
+            Logger.general.debug("UrlEventListener: failed to construct URL from path \(stringValue)")
             let error = NSError(domain: "CouldNotConstructURL", code: -1, userInfo: nil)
             PixelKit.fire(DebugEvent(GeneralPixel.appOpenURLFailed, error: error))
             return

DuckDuckGo/Assets.xcassets/Colors/AlertRed.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.215",
+          "green" : "0.197",
+          "red" : "0.846"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.375",
+          "green" : "0.380",
+          "red" : "0.924"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Colors/AlertRedHover.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.190",
+          "green" : "0.172",
+          "red" : "0.743"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.327",
+          "green" : "0.330",
+          "red" : "0.810"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Colors/AlertRedPressed.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.178",
+          "green" : "0.161",
+          "red" : "0.696"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.307",
+          "green" : "0.307",
+          "red" : "0.759"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

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

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

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Exclamation-FIlled-Recolorable-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/PPro-Feedback.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Privacy-Pro-16D.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Autoconsent/AutoconsentExperiment.swift

@@ -18,11 +18,12 @@
 
 import Foundation
 import Common
+import os.log
 
 enum AutoconsentFilterlistExperiment: String, CaseIterable {
     static var logic = AutoconsentExperimentLogic()
     static var cohort: AutoconsentFilterlistExperiment? {
-        os_log("🚧 requesting CPM cohort", log: .autoconsent, type: .debug)
+        Logger.autoconsent.debug("🚧 requesting CPM cohort")
         return logic.experimentCohort
     }
 
@@ -36,11 +37,11 @@ final internal class AutoconsentExperimentLogic {
            // if the stored cohort doesn't match, allocate a new one
            let cohort = AutoconsentFilterlistExperiment(rawValue: allocatedExperimentCohort)
         {
-            os_log("🚧 existing CPM cohort: %s", log: .autoconsent, type: .debug, String(describing: cohort.rawValue))
+            Logger.autoconsent.debug("🚧 existing CPM cohort: \(String(describing: cohort.rawValue))")
             return cohort
         }
         let cohort = AutoconsentFilterlistExperiment.allCases.randomElement()!
-        os_log("🚧 new CPM cohort: %s", log: .autoconsent, type: .debug, String(describing: cohort.rawValue))
+        Logger.autoconsent.debug("🚧 new CPM cohort: \(String(describing: cohort.rawValue))")
         allocatedExperimentCohort = cohort.rawValue
         return cohort
     }