Merge branch 'main' into sam/remove-apptp

# By Dominik Kapusta (3) and others # Via GitHub (1) and amddg44 (1) * main: 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) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj
duckduckgo · Apr 26, 2024 · 486bdeb · 486bdeb
2 parents b84cb8b + 5431826
commit 486bdeb
Show file tree

Hide file tree

Showing 30 changed files with 306 additions and 166 deletions.
diff --git a/.github/workflows/release.yml b/.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

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.116.0
+MARKETING_VERSION = 7.117.0
diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/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 {

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -651,8 +651,13 @@ extension Pixel {
         case privacyProOfferYearlyPriceClick
         case privacyProAddEmailSuccess
         case privacyProWelcomeFAQClick
+
+        // MARK: Secure Vault
+        case secureVaultL1KeyMigration
+        case secureVaultL2KeyMigration
+        case secureVaultL2KeyPasswordMigration
     }
-    
+
 }
 
 extension Pixel.Event: Equatable {}
@@ -1280,6 +1285,11 @@ extension Pixel.Event {
         case .privacyProOfferYearlyPriceClick: return "m_privacy-pro_offer_yearly-price_click"
         case .privacyProAddEmailSuccess: return "m_privacy-pro_app_add-email_success_u"
         case .privacyProWelcomeFAQClick: return "m_privacy-pro_welcome_faq_click_u"
+
+            // MARK: Secure Vault
+        case .secureVaultL1KeyMigration: return "m_secure-vault_keystore_event_l1-key-migration"
+        case .secureVaultL2KeyMigration: return "m_secure-vault_keystore_event_l2-key-migration"
+        case .secureVaultL2KeyPasswordMigration: return "m_secure-vault_keystore_event_l2-key-password-migration"
         }
     }
 }

diff --git a/Core/SyncCredentialsAdapter.swift b/Core/SyncCredentialsAdapter.swift
@@ -43,7 +43,7 @@ public final class SyncCredentialsAdapter {
     @UserDefaultsWrapper(key: .syncCredentialsPausedErrorDisplayed, defaultValue: false)
     static private var didShowCredentialsSyncPausedError: Bool
 
-    public init(secureVaultFactory: AutofillVaultFactory = AutofillSecureVaultFactory, secureVaultErrorReporter: SecureVaultErrorReporting) {
+    public init(secureVaultFactory: AutofillVaultFactory = AutofillSecureVaultFactory, secureVaultErrorReporter: SecureVaultReporting) {
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
         self.secureVaultErrorReporter = secureVaultErrorReporter
         databaseCleaner = CredentialsDatabaseCleaner(
@@ -134,5 +134,5 @@ public final class SyncCredentialsAdapter {
 
     private var syncDidCompleteSubject = PassthroughSubject<Void, Never>()
     private var syncErrorCancellable: AnyCancellable?
-    private let secureVaultErrorReporter: SecureVaultErrorReporting
+    private let secureVaultErrorReporter: SecureVaultReporting
 }
diff --git a/Core/SyncDataProviders.swift b/Core/SyncDataProviders.swift
@@ -97,7 +97,7 @@ public class SyncDataProviders: DataProvidersSource {
     public init(
         bookmarksDatabase: CoreDataDatabase,
         secureVaultFactory: AutofillVaultFactory = AutofillSecureVaultFactory,
-        secureVaultErrorReporter: SecureVaultErrorReporting,
+        secureVaultErrorReporter: SecureVaultReporting,
         settingHandlers: [SettingSyncHandler],
         favoritesDisplayModeStorage: FavoritesDisplayModeStoring
     ) {
@@ -139,5 +139,5 @@ public class SyncDataProviders: DataProvidersSource {
     private let syncMetadataDatabase: CoreDataDatabase = SyncMetadataDatabase.make()
     private let bookmarksDatabase: CoreDataDatabase
     private let secureVaultFactory: AutofillVaultFactory
-    private let secureVaultErrorReporter: SecureVaultErrorReporting
+    private let secureVaultErrorReporter: SecureVaultReporting
 }
diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
@@ -119,7 +119,7 @@ public struct UserDefaultsWrapper<T> {
 
         case privacyConfigCustomURL = "com.duckduckgo.ios.privacyConfigCustomURL"
 
-        case subscriptionIsActive = "com.duckduckgo.ios.subscruption.isActive"
+        case privacyProEnvironment = "com.duckduckgo.ios.privacyPro.environment"
 
         case didRefreshTimestamp = "com.duckduckgo.ios.userBehavior.didRefreshTimestamp"
         case didBurnTimestamp = "com.duckduckgo.ios.userBehavior.didBurnTimestamp"

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1713140318814,
+    "version": 1713866584967,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -135,6 +135,9 @@
                 {
                     "domain": "ksta.de"
                 },
+                {
+                    "domain": "larazon.es"
+                },
                 {
                     "domain": "motherdenim.com"
                 },
@@ -279,6 +282,18 @@
                 {
                     "domain": "condell-ltd.com"
                 },
+                {
+                    "domain": "leefgemeenschapzilt.nl"
+                },
+                {
+                    "domain": "healthline.com"
+                },
+                {
+                    "domain": "sporthoj.com"
+                },
+                {
+                    "domain": "www.michelinman.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -293,7 +308,6 @@
                 "disabledCMPs": [
                     "generic-cosmetic",
                     "termsfeed3",
-                    "strato.de",
                     "healthline-media",
                     "tarteaucitron.js"
                 ]
@@ -318,7 +332,7 @@
                     }
                 }
             },
-            "hash": "7bcdcdd586eee1580d67eb5da90d7b1a"
+            "hash": "4f2e843bd72823fdef89f63a06684625"
         },
         "autofill": {
             "exceptions": [
@@ -2858,6 +2872,27 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "independent.co.uk",
+                        "rules": [
+                            {
+                                "selector": "#partners",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#top-banner-wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[data-mpu1=true]",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#stickyFooterRoot",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "indiatimes.com",
                         "rules": [
@@ -4246,7 +4281,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "a84d50f4d13c41abd29a6467ce772fe6"
+            "hash": "3ac24d308c19228950dc49c54198b515"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -4819,18 +4854,11 @@
                     }
                 },
                 "toggleReports": {
-                    "state": "enabled",
-                    "rollout": {
-                        "steps": [
-                            {
-                                "percent": 10
-                            }
-                        ]
-                    }
+                    "state": "enabled"
                 }
             },
             "state": "enabled",
-            "hash": "b337f9c7cf15e7e4807ef232befaa999"
+            "hash": "66968d9b69520975185476473cc11824"
         },
         "privacyPro": {
             "state": "enabled",
@@ -5112,7 +5140,8 @@
                             {
                                 "rule": "static.adsafeprotected.com/iasPET.1.js",
                                 "domains": [
-                                    "corriere.it"
+                                    "corriere.it",
+                                    "independent.co.uk"
                                 ]
                             },
                             {
@@ -6736,7 +6765,8 @@
                                 "domains": [
                                     "andieswim.com",
                                     "footweartruth.com",
-                                    "kmail-lists.com"
+                                    "kmail-lists.com",
+                                    "usafacts.org"
                                 ]
                             }
                         ]
@@ -6949,7 +6979,8 @@
                             {
                                 "rule": "npttech.com/advertising.js",
                                 "domains": [
-                                    "blick.ch"
+                                    "blick.ch",
+                                    "independent.co.uk"
                                 ]
                             }
                         ]
@@ -8037,7 +8068,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "e9203e2a0820e7ed14993b6586ff999c"
+            "hash": "1bad593f22fec107fa37c357bc8ccfbe"
         },
         "trackingCookies1p": {
             "settings": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.116.0
		MARKETING_VERSION = 7.117.0