Merge branch 'release/7.92.0'

.github/workflows/alpha.yml

@@ -89,7 +89,7 @@ jobs:
       run: |
         app_version="$(cut -d ' ' -f 3 < Configuration/Version.xcconfig)"
         bundle exec fastlane increment_build_number_for_version version:$app_version app_identifier:"com.duckduckgo.mobile.ios.alpha"
-        bundle exec fastlane release_alpha groups:"${{ env.destination }}"
+        bundle exec fastlane release_alpha groups:["${{ env.destination }}"]
         build_version="$(xcodebuild -configuration Alpha -showBuildSettings | grep CURRENT_PROJECT_VERSION | tr -d 'CURRENT_PROJECT_VERSION =')"
         echo "dsyms_path=${{ github.workspace }}/DuckDuckGo-Alpha.app.dSYM.zip" >> $GITHUB_ENV
         echo "app_version=${app_version}" >> $GITHUB_ENV

.github/workflows/pr.yml

@@ -1,6 +1,6 @@
 name: PR Checks
 
-on: 
+on:
   push:
     branches: [ develop, "release/**" ]
   pull_request:
@@ -13,13 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check out the code
-      uses: actions/checkout@v3
-
-    - name: Run SwiftLint on all files
-      uses: norio-nomura/[email protected]
+    - uses: actions/checkout@v3
+    - name: SwiftLint
+      uses: docker://norionomura/swiftlint:0.53.0
       with:
-        args: --strict --force-exclude
+        args: swiftlint --reporter github-actions-logging --strict
 
   shellcheck:
 
@@ -44,6 +42,9 @@ jobs:
     runs-on: macos-13
     timeout-minutes: 30
 
+    outputs:
+      commit_author: ${{ steps.fetch_commit_author.outputs.commit_author }}
+
     steps:
     - name: Check out the code
       uses: actions/checkout@v3
@@ -112,6 +113,16 @@ jobs:
           | sort -u -k 1,2 \
           | 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'
+      id: fetch_commit_author
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        head_commit=$(git rev-parse HEAD)
+        author=$(gh api https://api.github.com/repos/${{ github.repository }}/commits/${head_commit} --jq .author.login)
+        echo "commit_author=${author}" >> $GITHUB_OUTPUT
+
   release-build:
 
     name: Make Release Build
@@ -174,24 +185,35 @@ jobs:
         -configuration "Release" \
         | xcbeautify
 
-  asana:
+  create-asana-task:
     name: Create Asana Task
     needs: [swiftlint, unit-tests, shellcheck, release-build]
 
-    if: failure() && github.ref_name == 'develop'
-
-    env:
-      WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
+    if: failure() && github.ref_name == 'develop' && github.run_attempt == 1
+
     runs-on: ubuntu-latest
 
     steps:
       - name: Create Asana Task
-        uses: malmstein/github-asana-action@master
+        uses: duckduckgo/BrowserServicesKit/.github/actions/asana-failed-pr-checks@main
+        with:
+          action: create-task
+          asana-access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          asana-section-id: ${{ vars.APPLE_CI_FAILING_TESTS_IOS_POST_MERGE_SECTION_ID }}
+          commit-author: ${{ needs.unit-tests.outputs.commit_author }}
+
+  close-asana-task:
+    name: Close Asana Task
+    needs: [swiftlint, unit-tests, shellcheck, release-build]
+
+    if: success() && github.ref_name == 'develop' && github.run_attempt > 1
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Close Asana Task
+        uses: duckduckgo/BrowserServicesKit/.github/actions/asana-failed-pr-checks@main
         with:
-          asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
-          asana-project: ${{ vars.APPLE_CI_FAILING_TESTS_PROJECT_ID }}
-          asana-section: ${{ vars.APPLE_CI_FAILING_TESTS_IOS_POST_MERGE_SECTION_ID }}
-          asana-task-name: 'PR Check is failing on develop'
-          action: create-asana-task
-          asana-task-description: PR Checks conducted after merging have failed. See ${{ env.WORKFLOW_URL }}. Follow the steps on https://app.asana.com/0/1202500774821704/1205317064731691 to resolve this issue.
+          action: close-task
+          asana-access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          asana-section-id: ${{ vars.APPLE_CI_FAILING_TESTS_IOS_POST_MERGE_SECTION_ID }}

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.91.1
+MARKETING_VERSION = 7.92.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"30f2a2ffc762a0b87627dc218ba71b7e\""
-        public static let embeddedDataSHA = "985db4a0b3bb35e7b116ace9bcffbfed40275a10ec39bbbb52d84de76a6769c9"
+        public static let embeddedDataETag = "\"54efb258435567856e087913f93d43df\""
+        public static let embeddedDataSHA = "d0f9c70c5baba23a0966b277f8b4c949ecf01612558a50d2bda720fe1919b43f"
     }
 
     public var embeddedDataEtag: String {

Core/AppTrackerDataSetProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"c9a18e593a4f5f8d32a18db294497226\""
-        public static let embeddedDataSHA = "6264eb92240fee69aeebb14aa333bdc8d76b2818fb7f44f0acb1fb0373d50af4"
+        public static let embeddedDataETag = "\"a1bb76901a395eb251cd6f30f54037f1\""
+        public static let embeddedDataSHA = "53cad742076d1382fba8db0e508307668eb0609738d526cb16cbc623b50410fc"
     }
 
     public var embeddedDataEtag: String {

Core/NetworkProtectionNotificationIdentifier.swift

@@ -0,0 +1,28 @@
+//
+//  NetworkProtectionNotificationIdentifier.swift
+//  DuckDuckGo
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+public enum NetworkProtectionNotificationIdentifier: String {
+    case reconnecting = "network-protection.notification.reconnecting"
+    case reconnected = "network-protection.notification.reconnected"
+    case connectionFailure = "network-protection.notification.connection-failure"
+    case superseded = "network-protection.notification.superseded"
+    case test = "network-protection.notification.test"
+}

Core/UIViewControllerExtension.swift

@@ -27,7 +27,7 @@ extension UIViewController {
     }
 
     var isPad: Bool {
-        return traitCollection.horizontalSizeClass == .regular
+        return UIDevice.current.userInterfaceIdiom == .pad
     }
 
     @objc func buildActivities() -> [UIActivity] {