Merge branch 'main' into sam/disable-on-demand-when-user-initiates-sh…

…utdown

# By Christopher Brind (4) and others
# Via Chris Brind (1) and others
* main: (21 commits)
  Update BSK to 141.1.1 (#2796)
  iOS: VPN Metadata Improvements (#2791)
  Add Internal Page suggestions support (#2784)
  iOS: Add pixels to track VPN wake and stop attempts (#2785)
  Fix bug that shows selected tab in strange position in the switcher (#2789)
  Remove AppTP (#2682)
  Release 7.117.0-1 (#2794)
  cherry pick progress bar fix (#2793)
  fix progress bar missing after cold launch (#2792)
  Check entitlements before showing VPN screen from notification (#2748)
  Add parameter allowed encoding to error descriptions (#2781)
  Update Lottie to 4.4.3 (#2765)
  Update to fastlane 2.220.0 to fix ad-hoc lane (#2782)
  iOS: Bundle-Specfic Autofill Secure Vault Keychain Items  (#2759)
  Fix dSYM archive upload to S3 (#2778)
  Fix dSYM archive upload to S3 (#2778)
  Release 7.117.0-0 (#2776)
  Select Subscription Environment in Debug Settings (#2766)
  lastDisconnectError now matches against NEVPNConnectionError (#2753)
  Release 7.116.0-3 (#2774)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

.github/workflows/release.yml

@@ -116,7 +116,9 @@ jobs:
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
         DSYM_S3_PATH: s3://${{ vars.DSYM_BUCKET_NAME }}/${{ vars.DSYM_BUCKET_PREFIX }}/
       run: |
-        aws s3 cp "${{ github.workspace }}/DuckDuckGo-${{ env.app_version }}-dSYM.zip" ${{ env.DSYM_S3_PATH }}
+        if [[ -f ${{ env.dsyms_path }} ]]; then
+          aws s3 cp "${{ env.dsyms_path }}" ${{ env.DSYM_S3_PATH }}
+        fi
 
     - name: Send Mattermost message
       if: ${{ success() || failure() }} # Don't execute when cancelled

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.115.1
+MARKETING_VERSION = 7.117.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"04caca2ca6549201eea931ca869c5e39\""
-        public static let embeddedDataSHA = "ddb923e2de2a0a27bc1050e32c89276834a3f3dd61b7c8672dac6f2d93047333"
+        public static let embeddedDataETag = "\"9971edb1448fd00023267a4b031fdb84\""
+        public static let embeddedDataSHA = "c75a34ec363f5c23806e107d20d3b34f1b588dcf4052eed545f4119ecae20337"
     }
 
     public var embeddedDataEtag: String {