Merge branch 'main' into sam/enable-netp-in-production

* main:
  Report macOS NetP connection attempts & tunnel failures (#2234)
  Always use black and white colors for the QR code (#2248)
  Update BSK with autofill 10.0.1 (#2245)
  Ensure that LinkPresentation framework is called on main thread (#2241)
  expose window.print handler to page world (#2243)
  Updates BSK (#2239)
  Add Geoswitching pixels (#2235)
  Fix spacing between buttons (#2237)
  Update all references to develop branch with main (#2231)
  Update TRK (#2200)
  Breakage report improvements (#2197)

.github/workflows/adhoc.yml

@@ -87,4 +87,4 @@ jobs:
         run: |
           curl -s "https://app.asana.com/api/1.0/tasks/${{ steps.get-task-id.outputs.task_id }}/attachments" \
             -H "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
-            --form "file=@${{ env.ipa_path }};type=application/zip"
+            --form "file=@${{ env.ipa_path }};type=application/zip"

.github/workflows/alpha.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
 
-    - name: Assert develop branch
+    - name: Assert main branch
       run: |
         case "${{ github.ref }}" in
-          *develop) ;;
-          *) echo "👎 Not develop branch"; exit 1 ;;
+          *main) ;;
+          *) echo "👎 Not main branch"; exit 1 ;;
         esac
 
     - name: Register SSH keys for access to certificates

.github/workflows/pr.yml

@@ -2,7 +2,7 @@ name: PR Checks
 
 on:
   push:
-    branches: [ develop, "release/**" ]
+    branches: [ main, "release/**" ]
   pull_request:
 
 jobs:
@@ -114,7 +114,7 @@ jobs:
           | xargs -L 1 ./scripts/report-failed-unit-test.sh -s ${{ vars.APPLE_CI_FAILING_TESTS_FAILED_TESTS_SECTION_ID }}
 
     - name: Fetch latest commit author
-      if: always() && github.ref_name == 'develop'
+      if: always() && github.ref_name == 'main'
       id: fetch_commit_author
       env:
         GH_TOKEN: ${{ github.token }}
@@ -189,7 +189,7 @@ jobs:
     name: Create Asana Task
     needs: [swiftlint, unit-tests, shellcheck, release-build]
 
-    if: failure() && github.ref_name == 'develop' && github.run_attempt == 1
+    if: failure() && github.ref_name == 'main' && github.run_attempt == 1
 
     runs-on: ubuntu-latest
 
@@ -206,7 +206,7 @@ jobs:
     name: Close Asana Task
     needs: [swiftlint, unit-tests, shellcheck, release-build]
 
-    if: success() && github.ref_name == 'develop' && github.run_attempt > 1
+    if: success() && github.ref_name == 'main' && github.run_attempt > 1
 
     runs-on: ubuntu-latest
 

.gitignore

@@ -73,3 +73,4 @@ fastlane/test_output
 # DuckDuckGo
 
 Configuration/ExternalDeveloper.xcconfig
+scripts/assets

Core/PixelEvent.swift

@@ -37,8 +37,10 @@ extension Pixel {
         case forgetAllDataCleared
 
         case privacyDashboardOpened
-        case privacyDashboardProtectionDisabled
-        case privacyDashboardProtectionEnabled
+
+        case dashboardProtectionAllowlistAdd
+        case dashboardProtectionAllowlistRemove
+
         case privacyDashboardReportBrokenSite
         case privacyDashboardPixelFromJS(rawPixel: String)
 
@@ -311,6 +313,7 @@ extension Pixel {
         // MARK: Network Protection
 
         case networkProtectionActiveUser
+        case networkProtectionNewUser
 
         case networkProtectionRekeyCompleted
         case networkProtectionLatency
@@ -372,6 +375,11 @@ extension Pixel {
         case networkProtectionWaitlistNotificationShown
         case networkProtectionWaitlistNotificationLaunched
 
+        case networkProtectionGeoswitchingOpened
+        case networkProtectionGeoswitchingSetNearest
+        case networkProtectionGeoswitchingSetCustom
+        case networkProtectionGeoswitchingNoLocations
+
         // MARK: remote messaging pixels
 
         case remoteMessageShown
@@ -553,9 +561,10 @@ extension Pixel.Event {
         case .forgetAllDataCleared: return "mf_dc"
 
         case .privacyDashboardOpened: return "mp"
-
-        case .privacyDashboardProtectionDisabled: return "mp_wla"
-        case .privacyDashboardProtectionEnabled: return "mp_wlr"
+
+        case .dashboardProtectionAllowlistAdd: return "mp_wla"
+        case .dashboardProtectionAllowlistRemove: return "mp_wlr"
+
         case .privacyDashboardReportBrokenSite: return "mp_rb"
         case .privacyDashboardPixelFromJS(let rawPixel): return rawPixel
 
@@ -833,6 +842,7 @@ extension Pixel.Event {
         // MARK: Network Protection pixels
 
         case .networkProtectionActiveUser: return "m_netp_daily_active_d"
+        case .networkProtectionNewUser: return "m_netp_daily_active_u"
         case .networkProtectionRekeyCompleted: return "m_netp_rekey_completed"
         case .networkProtectionLatency: return "m_netp_latency"
         case .networkProtectionTunnelConfigurationNoServerRegistrationInfo: return "m_netp_tunnel_config_error_no_server_registration_info"
@@ -886,6 +896,11 @@ extension Pixel.Event {
         case .networkProtectionWaitlistNotificationShown: return "m_netp_waitlist_notification_shown"
         case .networkProtectionWaitlistNotificationLaunched: return "m_netp_waitlist_notification_launched"
 
+        case .networkProtectionGeoswitchingOpened: return "m_netp_imp_geoswitching"
+        case .networkProtectionGeoswitchingSetNearest: return "m_netp_ev_geoswitching_set_nearest"
+        case .networkProtectionGeoswitchingSetCustom: return "m_netp_ev_geoswitching_set_custom"
+        case .networkProtectionGeoswitchingNoLocations: return "m_netp_ev_geoswitching_no_locations"
+
         // MARK: remote messaging pixels
 
         case .remoteMessageShown: return "m_remote_message_shown"

Core/PrintingUserScript.swift

@@ -42,6 +42,7 @@ public class PrintingUserScript: NSObject, UserScript {
     public var injectionTime: WKUserScriptInjectionTime = .atDocumentStart
     public var forMainFrameOnly: Bool = false
     public var messageNames: [String] = ["printHandler"]
+    public var requiresRunInPageContentWorld: Bool = true
 
     public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         delegate?.printingUserScriptDidRequestPrintController(self)