Merge branch 'release/7.93.0'

duckduckgo · Oct 10, 2023 · c9afbea · c9afbea
2 parents 199e701 + 116234d
commit c9afbea
Show file tree

Hide file tree

Showing 87 changed files with 1,638 additions and 543 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -39,7 +39,7 @@ jobs:
 
     name: Unit Tests
 
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     outputs:
@@ -127,7 +127,7 @@ jobs:
 
     name: Make Release Build
 
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     steps:

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.92.0
+MARKETING_VERSION = 7.93.0
diff --git a/Core/DefaultVariantManager.swift b/Core/DefaultVariantManager.swift
@@ -25,6 +25,8 @@ import BrowserServicesKit
 extension FeatureName {
     // Define your feature e.g.:
     // public static let experimentalFeature = FeatureName(rawValue: "experimentalFeature")
+
+    public static let fixedUserAgent = FeatureName(rawValue: "fixedUserAgent")
 }
 
 public struct VariantIOS: Variant {
@@ -59,6 +61,8 @@ public struct VariantIOS: Variant {
         VariantIOS(name: "sc", weight: doNotAllocate, isIncluded: When.always, features: []),
         VariantIOS(name: "sd", weight: doNotAllocate, isIncluded: When.always, features: []),
         VariantIOS(name: "se", weight: doNotAllocate, isIncluded: When.always, features: []),
+        VariantIOS(name: "me", weight: 1, isIncluded: When.always, features: []),
+        VariantIOS(name: "mf", weight: 1, isIncluded: When.always, features: [.fixedUserAgent]),
         returningUser
     ]
 

diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -28,6 +28,7 @@ public enum FeatureFlag: String {
     case autofillInlineIconCredentials
     case autofillAccessCredentialManagement
     case autofillPasswordGeneration
+    case autofillOnByDefault
     case incontextSignup
     case appTrackingProtection
     case networkProtection
@@ -48,6 +49,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutofillSubfeature.accessCredentialManagement))
         case .autofillPasswordGeneration:
             return .remoteReleasable(.subfeature(AutofillSubfeature.autofillPasswordGeneration))
+        case .autofillOnByDefault:
+            return .remoteReleasable(.subfeature(AutofillSubfeature.onByDefault))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
         }

diff --git a/Core/NetworkProtectionNotificationIdentifier.swift b/Core/NetworkProtectionNotificationIdentifier.swift
@@ -20,9 +20,7 @@
 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 connection = "network-protection.notification.connection"
     case superseded = "network-protection.notification.superseded"
     case test = "network-protection.notification.test"
 }
diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -126,6 +126,8 @@ public struct PixelParameters {
     public static let returnUserErrorCode = "error_code"
     public static let returnUserOldATB = "old_atb"
     public static let returnUserNewATB = "new_atb"
+
+    public static let autofillDefaultState = "default_state"
 }
 
 public struct PixelValues {

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -502,7 +502,6 @@ extension Pixel {
         case emailIncontextModalExitEarlyContinue
 
         case compilationFailed
-        case incrementalRolloutTest
     }
 
 }
@@ -985,8 +984,6 @@ extension Pixel.Event {
         case .debugReturnUserAddATB: return "m_debug_return_user_add_atb"
         case .debugReturnUserReadATB: return "m_debug_return_user_read_atb"
         case .debugReturnUserUpdateATB: return "m_debug_return_user_update_atb"
-
-        case .incrementalRolloutTest: return "m_autofill_incremental_rollout_test"
         }
 
     }

diff --git a/Core/UserAgentManager.swift b/Core/UserAgentManager.swift
@@ -130,7 +130,7 @@ struct UserAgent {
     private let applicationComponent = "DuckDuckGo/\(AppVersion.shared.majorVersionNumber)"
     private let statistics: StatisticsStore
     private let isTesting: Bool = ProcessInfo().arguments.contains("testing")
-    
+
     init(defaultAgent: String = Constants.fallbackDefaultAgent, statistics: StatisticsStore = StatisticsUserDefaults()) {
         versionComponent = UserAgent.createVersionComponent(fromAgent: defaultAgent)
         baseAgent = UserAgent.createBaseAgent(fromAgent: defaultAgent, versionComponent: versionComponent)
@@ -181,6 +181,7 @@ struct UserAgent {
         return versions
     }
 
+    // swiftlint:disable:next cyclomatic_complexity
     public func agent(forUrl url: URL?,
                       isDesktop: Bool,
                       privacyConfig: PrivacyConfiguration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig) -> String {
@@ -209,6 +210,10 @@ struct UserAgent {
             return ddgFixedLogic(forUrl: url, isDesktop: isDesktop, privacyConfig: privacyConfig)
         }
 
+        if DefaultVariantManager().isSupported(feature: .fixedUserAgent) {
+            return ddgFixedLogic(forUrl: url, isDesktop: isDesktop, privacyConfig: privacyConfig)
+        }
+
         switch defaultPolicy(forConfig: privacyConfig) {
         case .ddg: return oldLogic(forUrl: url, isDesktop: isDesktop, privacyConfig: privacyConfig)
         case .ddgFixed: return ddgFixedLogic(forUrl: url, isDesktop: isDesktop, privacyConfig: privacyConfig)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.92.0
		MARKETING_VERSION = 7.93.0