Merge remote-tracking branch 'origin/main' into anya/translations-aut…

…ofill-passwords

.github/workflows/alpha.yml

@@ -33,6 +33,7 @@ jobs:
   make-alpha:
     runs-on: macos-13
     name: Make TestFlight Alpha Build
+    timeout-minutes: 30
 
     env:
       destination: ${{ github.event.inputs.destination || inputs.destination }}

.github/workflows/sync-end-to-end.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       matrix:
         os-version: [15, 16, 17]
-      #max-parallel: 1 # Uncomment this line to run tests sequentially. 
+      max-parallel: 1 # Uncomment this line to run tests sequentially. 
       fail-fast: false
 
     steps:

.maestro/shared/add_login_from_settings.yaml

@@ -1,7 +1,7 @@
 appId: com.duckduckgo.mobile.ios
 ---
 
-- tapOn: Logins
+- tapOn: Passwords
 - tapOn: Add 24
 - tapOn: Title
 - inputText: My Personal Website
@@ -10,6 +10,6 @@ appId: com.duckduckgo.mobile.ios
 - tapOn: example.com
 - inputText: mypersonalwebsite.com
 - tapOn: Save
-- tapOn: Logins
+- tapOn: Passwords
 - tapOn: Settings
 - tapOn: Done

.maestro/shared/remove_local_logins.yaml

@@ -2,13 +2,12 @@ appId: com.duckduckgo.mobile.ios
 ---
 
 - tapOn: Settings
-- tapOn: Logins
-- assertVisible: Unlock device to access saved Logins
+- tapOn: Passwords
 - tapOn: Passcode field
 - inputText: "0000"
 - pressKey: Enter
 - tapOn: My Personal Website 
-- tapOn: Delete Login
-- tapOn: Delete Login
+- tapOn: Delete Password
+- tapOn: Delete Password
 - tapOn: Settings
 - tapOn: Done

.maestro/shared/sync_verify_logins.yaml

@@ -1,29 +1,28 @@
 appId: com.duckduckgo.mobile.ios
 ---
 
-- tapOn: Logins
-- assertVisible: Unlock device to access saved Logins
+- tapOn: Passwords
 - tapOn: Passcode field
 - inputText: "0000"
 - pressKey: Enter
 - assertVisible: Dax Login
 - tapOn: Dax Login
 - assertVisible: daxthetest
 - assertVisible: duckduckgo.com
-- tapOn: Logins
+- tapOn: Passwords
 - assertVisible: Github
 - tapOn: Github
 - assertVisible: githubusername
 - assertVisible: github.com
-- tapOn: Logins
+- tapOn: Passwords
 - assertVisible: StackOverflow
 - tapOn: StackOverflow
 - assertVisible: stacker
 - assertVisible: stackoverflow.com
-- tapOn: Logins
+- tapOn: Passwords
 - assertVisible: My Personal Website
 - tapOn: My Personal Website
 - assertVisible: [email protected]
 - assertVisible: mypersonalwebsite.com
-- tapOn: Logins
-- tapOn: Settings
+- tapOn: Passwords
+- tapOn: Settings

.maestro/sync_tests/05_delete_account.yaml

@@ -0,0 +1,39 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - sync
+
+---
+
+# Clear and launch
+- clearState
+- launchApp
+
+# Run onboarding Flow
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+# Set Internal User
+- tapOn: Settings
+- runFlow:
+    file: ../shared/set_internal_user_from_settings.yaml
+
+# Create account
+- runFlow:
+    file: ../shared/sync_create.yaml
+
+# Remove account
+- runFlow:
+    file: ../shared/sync_delete.yaml
+
+# Try to login and check for error
+- assertVisible: Begin Syncing
+- tapOn: Sync with Another Device
+- assertVisible: Scan QR Code
+- tapOn: Manually Enter Code
+- tapOn: Paste
+- assertVisible: Sync Error
+- tapOn: OK

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"f4e8436ab9977e1a8a9d6ee600fc353e\""
-        public static let embeddedDataSHA = "86b3a7bece52da74f7d267c2b522ac929d363a384cacc013f2b2d057ee1e386c"
+        public static let embeddedDataETag = "\"388dd0526e94f80473728c0bfbb48b39\""
+        public static let embeddedDataSHA = "f7b9ae8860ff84f33e602b40d0938776d2d9327115b4ddfe09fc0fa09b5e1ff1"
     }
 
     public var embeddedDataEtag: String {

Core/BookmarksModelsErrorHandling.swift

@@ -57,10 +57,6 @@ public class BookmarksModelsErrorHandling: EventMapping<BookmarksModelError> {
 
             case .missingParent(let object):
                 domainEvent = .missingParent(object)
-            case .orphanedBookmarksPresent:
-                if let syncService, syncService.authState == .inactive {
-                    domainEvent = .orphanedBookmarksPresent
-                }
             }
 
             if let domainEvent {

Core/DailyPixel.swift

@@ -51,10 +51,14 @@ public final class DailyPixel {
     /// Does not append any suffix unlike the alternative function below
     public static func fire(pixel: Pixel.Event,
                             withAdditionalParameters params: [String: String] = [:],
+                            includedParameters: [Pixel.QueryParameters] = [.atb, .appVersion],
                             onComplete: @escaping (Swift.Error?) -> Void = { _ in }) {
 
         if !pixel.hasBeenFiredToday(dailyPixelStorage: storage) {
-            Pixel.fire(pixel: pixel, withAdditionalParameters: params, onComplete: onComplete)
+            Pixel.fire(pixel: pixel,
+                       withAdditionalParameters: params,
+                       includedParameters: includedParameters,
+                       onComplete: onComplete)
             updatePixelLastFireDate(pixel: pixel)
         } else {
             onComplete(Error.alreadyFired)

Core/FeatureFlag.swift

@@ -39,8 +39,10 @@ public enum FeatureFlag: String {
 extension FeatureFlag: FeatureFlagSourceProviding {
     public var source: FeatureFlagSource {
         switch self {
-        case .debugMenu, .sync, .appTrackingProtection:
+        case .debugMenu, .appTrackingProtection:
             return .internalOnly
+        case .sync:
+            return .remoteReleasable(.subfeature(SyncSubfeature.level0ShowSync))
         case .networkProtection:
             return .remoteReleasable(.feature(.networkProtection))
         case .networkProtectionWaitlistAccess:

Core/PixelEvent.swift

@@ -505,7 +505,6 @@ extension Pixel {
         case indexOutOfRange(BookmarksModelError.ModelType)
         case saveFailed(BookmarksModelError.ModelType)
         case missingParent(BookmarksModelError.ObjectType)
-        case orphanedBookmarksPresent
 
         case bookmarksCouldNotLoadDatabase
         case bookmarksCouldNotPrepareDatabase
@@ -1036,7 +1035,6 @@ extension Pixel.Event {
         case .indexOutOfRange(let modelType): return "m_d_bookmarks_index_out_of_range_\(modelType.rawValue)"
         case .saveFailed(let modelType): return "m_d_bookmarks_view_model_save_failed_\(modelType.rawValue)"
         case .missingParent(let objectType): return "m_d_bookmark_model_missing_parent_\(objectType.rawValue)"
-        case .orphanedBookmarksPresent: return "m_d_bookmarks_orphans_present"
 
         case .bookmarksCouldNotLoadDatabase: return "m_d_bookmarks_could_not_load_database"
         case .bookmarksCouldNotPrepareDatabase: return "m_d_bookmarks_could_not_prepare_database"

Core/SyncMetricsEventsHandler.swift

@@ -27,9 +27,9 @@ public class SyncMetricsEventsHandler: EventMapping<MetricsEvent> {
         super.init { event, _, _, _ in
             switch event {
             case .overrideEmailProtectionSettings:
-                Pixel.fire(pixel: .syncDuckAddressOverride)
+                Pixel.fire(pixel: .syncDuckAddressOverride, includedParameters: [.appVersion])
             case .localTimestampResolutionTriggered(let feature):
-                Pixel.fire(pixel: .syncLocalTimestampResolutionTriggered(feature))
+                Pixel.fire(pixel: .syncLocalTimestampResolutionTriggered(feature), includedParameters: [.appVersion])
             }
         }
     }

Core/UserDefaultsPropertyWrapper.swift

@@ -57,6 +57,7 @@ public struct UserDefaultsWrapper<T> {
         case legacyCovidInfo = "com.duckduckgo.ios.home.covidInfo"
 
         case lastConfigurationRefreshDate = "com.duckduckgo.ios.lastConfigurationRefreshDate"
+        case lastConfigurationUpdateDate = "com.duckduckgo.ios.lastConfigurationUpdateDate"
         case lastRemoteMessagingRefreshDate = "com.duckduckgo.ios.lastRemoteMessagingRefreshDate"
 
         case doNotSell = "com.duckduckgo.ios.sendDoNotSell"
@@ -106,12 +107,16 @@ public struct UserDefaultsWrapper<T> {
         case syncIsEligibleForFaviconsFetcherOnboarding = "com.duckduckgo.ios.sync-is-eligible-for-favicons-fetcher-onboarding"
         case syncDidPresentFaviconsFetcherOnboarding = "com.duckduckgo.ios.sync-did-present-favicons-fetcher-onboarding"
         case syncDidMigrateToImprovedListsHandling = "com.duckduckgo.ios.sync-did-migrate-to-improved-lists-handling"
+        case syncDidShowSyncPausedByFeatureFlagAlert = "com.duckduckgo.ios.sync-did-show-sync-paused-by-feature-flag-alert"
 
         case networkProtectionDebugOptionAlwaysOnDisabled = "com.duckduckgo.network-protection.always-on.disabled"
         case networkProtectionWaitlistTermsAndConditionsAccepted = "com.duckduckgo.ios.vpn.terms-and-conditions-accepted"
 
         case addressBarPosition = "com.duckduckgo.ios.addressbarposition"
         case showFullSiteAddress = "com.duckduckgo.ios.showfullsiteaddress"
+
+        case privacyConfigCustomURL = "com.duckduckgo.ios.privacyConfigCustomURL"
+
     }
 
     private let key: Key