Merge branch 'main' into sam/use-manual-signing-for-development

* main:
  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)
  Update BSK reference to include the disable rekeying flag (#2219)
  Final NetP ship review feedback (#2221)
  Improve handling lists in Sync (#2192)
  remove address bar position pixels (#2220)

.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)
 
@@ -262,9 +264,6 @@ extension Pixel {
 
         case autofillJSPixelFired(_ pixel: AutofillUserScript.JSPixel)
 
-        case navigationbarPositionBottom
-        case navigationBarPositionTop
-
         case secureVaultInitError
         case secureVaultError
 
@@ -375,6 +374,11 @@ extension Pixel {
         case networkProtectionWaitlistNotificationShown
         case networkProtectionWaitlistNotificationLaunched
 
+        case networkProtectionGeoswitchingOpened
+        case networkProtectionGeoswitchingSetNearest
+        case networkProtectionGeoswitchingSetCustom
+        case networkProtectionGeoswitchingNoLocations
+
         // MARK: remote messaging pixels
 
         case remoteMessageShown
@@ -556,9 +560,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
 
@@ -625,9 +630,6 @@ extension Pixel.Event {
         case .autocompleteSelectedLocal: return "m_au_l"
         case .autocompleteSelectedRemote: return "m_au_r"
 
-        case .navigationbarPositionBottom: return "m_seturlbar_bottom"
-        case .navigationBarPositionTop: return "m_seturlbar_top"
-
         case .feedbackPositive: return "mfbs_positive_submit"
         case .feedbackNegativePrefix(category: let category): return "mfbs_negative_\(category)"
 
@@ -892,6 +894,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/SyncBookmarksAdapter.swift

@@ -65,12 +65,6 @@ public final class SyncBookmarksAdapter {
     public let databaseCleaner: BookmarkDatabaseCleaner
     public let syncDidCompletePublisher: AnyPublisher<Void, Never>
 
-    public var shouldResetBookmarksSyncTimestamp: Bool = false {
-        willSet {
-            assert(provider == nil, "Setting this value has no effect after provider has been instantiated")
-        }
-    }
-
     @UserDefaultsWrapper(key: .syncBookmarksPaused, defaultValue: false)
     static public var isSyncBookmarksPaused: Bool {
         didSet {
@@ -81,6 +75,9 @@ public final class SyncBookmarksAdapter {
     @UserDefaultsWrapper(key: .syncBookmarksPausedErrorDisplayed, defaultValue: false)
     static private var didShowBookmarksSyncPausedError: Bool
 
+    @UserDefaultsWrapper(key: .syncDidMigrateToImprovedListsHandling, defaultValue: false)
+    private var didMigrateToImprovedListsHandling: Bool
+
     @Published
     public var isFaviconsFetchingEnabled: Bool = UserDefaultsWrapper(key: .syncAutomaticallyFetchFavicons, defaultValue: false).wrappedValue {
         didSet {
@@ -149,7 +146,8 @@ public final class SyncBookmarksAdapter {
                 }
             }
         )
-        if shouldResetBookmarksSyncTimestamp {
+        if !didMigrateToImprovedListsHandling {
+            didMigrateToImprovedListsHandling = true
             provider.lastSyncTimestamp = nil
         }
 

Core/UserDefaultsPropertyWrapper.swift

@@ -105,6 +105,7 @@ public struct UserDefaultsWrapper<T> {
         case syncIsFaviconsFetcherEnabled = "com.duckduckgo.ios.sync-is-favicons-fetcher-enabled"
         case syncIsEligibleForFaviconsFetcherOnboarding = "com.duckduckgo.ios.sync-is-eligible-for-favicons-fetcher-onboarding"
         case syncDidPresentFaviconsFetcherOnboarding = "com.duckduckgo.ios.sync-did-present-favicons-fetcher-onboarding"
+        case syncDidMigrateToImprovedListsHandling = "com.duckduckgo.ios.sync-did-migrate-to-improved-lists-handling"
 
         case networkProtectionDebugOptionAlwaysOnDisabled = "com.duckduckgo.network-protection.always-on.disabled"
         case networkProtectionWaitlistTermsAndConditionsAccepted = "com.duckduckgo.ios.vpn.terms-and-conditions-accepted"