Merge branch 'develop' into brindy/theme-designer

.maestro/release_tests/emailprotection.yaml

@@ -0,0 +1,24 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
+---
+
+- clearState
+- launchApp
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+- tapOn: Settings
+- scroll
+- scroll
+- assertVisible: Email Protection
+- tapOn: Email Protection, Block email trackers and hide your address
+- assertVisible:
+    id: searchEntry
+- assertVisible: https://duckduckgo.com/email/
+- assertVisible: Email privacy, simplified.

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.94.0
+MARKETING_VERSION = 7.96.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"34b6806ec63c85144adb71af7e899b40\""
-        public static let embeddedDataSHA = "167fdf9054fd7a0f8b2e9b5f84a8dae7d569752b0278d82b6a394380531f61e5"
+        public static let embeddedDataETag = "\"39c652b21aa330463726faf240e03445\""
+        public static let embeddedDataSHA = "b19c28e816008ace47a9e3e58f74eef6558b5cbdcd7d79d098d7d2e56d686075"
     }
 
     public var embeddedDataEtag: String {

Core/AppURLs.swift

@@ -29,14 +29,15 @@ public extension URL {
 
     static let autocomplete = URL(string: "\(base)/ac/")!
     static let emailProtection = URL(string: "\(base)/email")!
+    static let emailProtectionSignUp = URL(string: "\(base)/email/start-incontext")!
     static let emailProtectionQuickLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/email"))!
     static let aboutLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/about"))!
 
     static let surrogates = URL(string: "\(staticBase)/surrogates.txt")!
 
     // The following URLs shall match the ones in update_embedded.sh. 
     // Danger checks that the URLs match on every PR. If the code changes, the regex that Danger uses may need an update.
-    static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v3/ios-config.json")!
+    static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v4/ios-config.json")!
     static let trackerDataSet = URL(string: "\(staticBase)/trackerblocking/v5/current/ios-tds.json")!
     static let bloomFilter = URL(string: "\(staticBase)/https/https-mobile-v2-bloom.bin")!
     static let bloomFilterSpec = URL(string: "\(staticBase)/https/https-mobile-v2-bloom-spec.json")!

Core/ContentBlocking.swift

@@ -22,6 +22,7 @@ import BrowserServicesKit
 import Combine
 import Common
 
+
 public final class ContentBlocking {
     public static let shared = ContentBlocking()
 
@@ -34,6 +35,11 @@ public final class ContentBlocking {
     private let exceptionsSource: DefaultContentBlockerRulesExceptionsSource
     private let lastCompiledRulesStore: AppLastCompiledRulesStore
 
+    public var onCriticalError: (() -> Void)? {
+        didSet {
+            contentBlockingManager.onCriticalError = onCriticalError
+        }
+    }
 
     private init(privacyConfigurationManager: PrivacyConfigurationManaging? = nil) {
         let internalUserDecider = DefaultInternalUserDecider(store: InternalUserStore())
@@ -128,7 +134,7 @@ public final class ContentBlocking {
         }
 
     }
-    
+
     public func makeAdClickAttributionDetection(tld: TLD) -> AdClickAttributionDetection {
         AdClickAttributionDetection(feature: adClickAttribution,
                                     tld: tld,

Core/StatisticsLoader.swift

@@ -134,6 +134,7 @@ public class StatisticsLoader {
     public func storeUpdateVersionIfPresent(_ atb: Atb) {
         if let updateVersion = atb.updateVersion {
             statisticsStore.atb = updateVersion
+            statisticsStore.variant = nil
             returnUserMeasurement.updateStoredATB(atb)
         }
     }