Merge branch 'develop' into sam/disable-apptp-database-initialization

# Conflicts: # DuckDuckGo/AppDelegate.swift
duckduckgo · Oct 30, 2023 · 3fe8ab2 · 3fe8ab2
2 parents 3386a76 + 4dcd6af
commit 3fe8ab2
Show file tree

Hide file tree

Showing 69 changed files with 2,488 additions and 1,727 deletions.
diff --git a/.maestro/privacy_tests/06_multi-tab.yaml b/.maestro/privacy_tests/06_multi-tab.yaml
@@ -70,10 +70,8 @@ tags:
 - tapOn: "Done"
 - assertVisible:
     text: "Publisher site"
-- assertVisible:
-    id: "Tabs"
-- tapOn: 
-    id: "Tabs"   
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher 
 - assertVisible:
     id: "Add"
 - tapOn:

diff --git a/.maestro/release_tests/tabs.yaml b/.maestro/release_tests/tabs.yaml
@@ -20,7 +20,7 @@ tags:
     id: "searchEntry"
 - tapOn: 
     id: "searchEntry"
-- inputText: "https://privacy-test-pages.glitch.me"
+- inputText: "https://privacy-test-pages.site"
 - pressKey: Enter
 
 # Manage onboarding
@@ -34,10 +34,8 @@ tags:
 - assertVisible: ".*Privacy Test Pages.*"
 
 # Add tab
-- assertVisible:
-    id: "Tabs"
-- tapOn: 
-    id: "Tabs"
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
 - assertVisible: ".*Privacy Test Pages.*"
 - assertVisible: 
     id: "Add"
@@ -52,23 +50,19 @@ tags:
 - assertVisible: "Search engine"
 
 # Switch Tab
-- assertVisible:
-    id: "Tabs"
-- tapOn: 
-    id: "Tabs"
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
 - assertVisible: ".*Privacy Test Pages.*"
 - assertVisible: ".*Ad Click Flow.*"
 - assertVisible: "2 Private Tabs"
-- tapOn: "Open \"Privacy Test Pages - Home\" at privacy-test-pages.glitch.me"
+- tapOn: "Open \"Privacy Test Pages - Home\" at privacy-test-pages.site"
 - assertNotVisible: ".*Ad Click Flow.*"
 - assertVisible: ".*Privacy Test Pages.*"
 - tapOn: "Refresh Page"
 
 # Close Tab
-- assertVisible:
-    id: "Tabs"
-- tapOn: 
-    id: "Tabs"
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
 - assertVisible: ".*Privacy Test Pages.*"
 - assertVisible: ".*Ad Click Flow.*"
 - assertVisible: "2 Private Tabs"

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.93.0
+MARKETING_VERSION = 7.94.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 = "\"54efb258435567856e087913f93d43df\""
-        public static let embeddedDataSHA = "d0f9c70c5baba23a0966b277f8b4c949ecf01612558a50d2bda720fe1919b43f"
+        public static let embeddedDataETag = "\"34b6806ec63c85144adb71af7e899b40\""
+        public static let embeddedDataSHA = "167fdf9054fd7a0f8b2e9b5f84a8dae7d569752b0278d82b6a394380531f61e5"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/AppTrackerDataSetProvider.swift b/Core/AppTrackerDataSetProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"a1bb76901a395eb251cd6f30f54037f1\""
-        public static let embeddedDataSHA = "53cad742076d1382fba8db0e508307668eb0609738d526cb16cbc623b50410fc"
+        public static let embeddedDataETag = "\"3b73923ebfd4702c33aea682db0bac11\""
+        public static let embeddedDataSHA = "16e1e52530db19badfefc9a07d76620f9c608c12dc144f67020da8a9a4ddb0fa"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/AppURLs.swift b/Core/AppURLs.swift
@@ -33,6 +33,9 @@ public extension URL {
     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 trackerDataSet = URL(string: "\(staticBase)/trackerblocking/v5/current/ios-tds.json")!
     static let bloomFilter = URL(string: "\(staticBase)/https/https-mobile-v2-bloom.bin")!

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -245,6 +245,9 @@ extension Pixel {
 
         case autofillJSPixelFired(_ pixel: AutofillUserScript.JSPixel)
 
+        case navigationbarPositionBottom
+        case navigationBarPositionTop
+
         case secureVaultInitError
         case secureVaultError
 
@@ -576,7 +579,10 @@ extension Pixel.Event {
 
         case .autocompleteSelectedLocal: return "m_au_l"
         case .autocompleteSelectedRemote: return "m_au_r"
-
+
+        case .navigationbarPositionBottom: return "m_seturlbar_bottom"
+        case .navigationBarPositionTop: return "m_seturlbar_top"
+
         case .feedbackPositive: return "mfbs_positive_submit"
         case .feedbackNegativePrefix(category: let category): return "mfbs_negative_\(category)"
 

diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
@@ -99,6 +99,9 @@ public struct UserDefaultsWrapper<T> {
         case syncEnvironment = "com.duckduckgo.ios.sync-environment"
 
         case networkProtectionDebugOptionAlwaysOnDisabled = "com.duckduckgo.network-protection.always-on.disabled"
+
+        case addressBarPosition = "com.duckduckgo.ios.addressbarposition"
+        case showFullSiteAddress = "com.duckduckgo.ios.showfullsiteaddress"
     }
 
     private let key: Key
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.93.0
		MARKETING_VERSION = 7.94.0