Merge branch 'develop' into sam/hack-days-netp-widget

# By Christopher Brind (3) and others
# Via GitHub (1) and Michal Smaga (1)
* develop:
  Support environment setting (#2140)
  Update BSK (#2136)
  Update BSK for NetP change (#2134)
  Update test to match exact tracker (#2133)
  Avoid AppTP DB initialization when disabled (#2090)
  re-enable keyboard shortcuts (#2132)
  fix favorite launch with keyboard bug (#2131)
  Fix syncing empty favorites folders (#2121)
  kill variant when receiving atb update (#2130)
  Adding 'protectionsState' to breakage form submission (#2120)
  Release 7.96.0 (#2128)
  Update remote messaging production url (#2124)
  Alert user about abnormal app conditions (#2110)

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

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.95.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 = "\"a0d037f309e88ecd0b730418db6d73c5\""
-        public static let embeddedDataSHA = "9fc440e5eb590195150839759a56b34dd91cd5d11c84867526467362b7da08e7"
+        public static let embeddedDataETag = "\"39c652b21aa330463726faf240e03445\""
+        public static let embeddedDataSHA = "b19c28e816008ace47a9e3e58f74eef6558b5cbdcd7d79d098d7d2e56d686075"
     }
 
     public var embeddedDataEtag: String {

Core/AppURLs.swift

@@ -29,6 +29,7 @@ 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"))!
 

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)
         }
     }