Merge branch 'main' into bartek/bookmarks-debugging

# By Dominik Kapusta (3) and others
# Via GitHub
* main:
  New Tab Page Settings (#3140)
  New Tab Page Settings Storage (#3159)
  Prevent endless rekey and tunnel update cycle (#3091)
  tentatively fix content blocking UI test (#3141)
  Update Autofill UI test to reflect updated app copy (#3158)
  Duck player support on RMF (#3146)
  Release 7.131.0-0 (#3157)
  Update BSK with autofill 12.1.0 (#3155)
  Report Autofill issues via Passwords screen (#3116)
  Update GRDB to 2.4.0 (upstream 6.29.0, SQLCipher 4.6.0) (#3153)
  Update fastlane to 2.222.0 (#3154)
  [DuckPlayer] 13. Add openInfo message to Overlay (#3151)
  [DuckPlayer] 12. Ensure DuckPlayer does not leak without the proper config (#3147)
  [DuckPlayer] 11. Tab views and Pixel updates (#3145)
  Remove the NETWORK_PROTECTION compilation flag (#3139)
  Add favorites empty state tooltip (#3119)
  Bump submodules/privacy-reference-tests from `a603ff9` to `afb4f61` (#3113)
  iOS 14 deprecation cleanup (#3098)
  Update Xcode version to 15.4 (#3142)

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

.github/workflows/adhoc.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   make-adhoc:
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     name: Make ad-hoc build
 
     steps:

.github/workflows/alpha.yml

@@ -31,7 +31,7 @@ on:
 
 jobs:
   make-alpha:
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     name: Make TestFlight Alpha Build
     timeout-minutes: 30
 

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

@@ -8,7 +8,7 @@ on:
 jobs:
   end-to-end-tests:
     name: End to end Tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
 
     steps:
     - name: Check out the code

.github/workflows/nightly.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   atb-ui-tests:
     name: ATB UI Tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 30
 
     steps:
@@ -68,7 +68,7 @@ jobs:
 
   fingerprinting-ui-tests:
     name: Fingerprinting UI Tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 30
 
     steps:

.github/workflows/pr.yml

@@ -39,7 +39,7 @@ jobs:
 
     name: Unit Tests
 
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 15
 
     outputs:
@@ -132,7 +132,7 @@ jobs:
     # Dependabot doesn't have access to all secrets, so we skip this job
     if: github.actor != 'dependabot[bot]'
 
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 30
 
     steps:

.github/workflows/release.yml

@@ -27,7 +27,7 @@ on:
 jobs:
   make-release:
     if: github.event.action == 0 || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Merge triggers release')) # empty string returns 0; for case when workflow is triggered manually
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     name: Make App Store Connect Release
 
     steps:

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

@@ -8,7 +8,7 @@ on:
 jobs:
   build-for-sync-end-to-end-tests:
     name: Build for Sync End To End Tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 30
 
     steps:
@@ -68,7 +68,7 @@ jobs:
   sync-end-to-end-tests:
     name: Sync End To End Tests
     needs: build-for-sync-end-to-end-tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-14-xlarge
     timeout-minutes: 90
     strategy:
       matrix:

.maestro/release_tests/content-blocking.yaml

@@ -45,8 +45,13 @@ tags:
 - tapOn: "Don't Send"
 
 - tapOn: "Refresh Page"
+- extendedWaitUntil: 
+    notVisible: "Nonsense text that won't exist"
+    timeout: 2000
+
 - assertVisible: "1 major tracker loaded via script src"
 
 - tapOn: 
     id: PrivacyIcon
 - assertVisible: "Protections are OFF for this site"
+

.maestro/release_tests/password-autofill.yaml

@@ -57,7 +57,7 @@ tags:
 - assertVisible: "[email protected]"
 - tapOn: "[email protected]"
 
-- assertVisible: "Unlock to use saved password"
+- assertVisible: "Unlock device to use saved password"
 - inputText: "passcode"
 - pressKey: Enter
 
@@ -73,7 +73,7 @@ tags:
 - assertVisible: "[email protected]"
 - tapOn: "[email protected]"
 
-- assertVisible: "Unlock to use saved password"
+- assertVisible: "Unlock device to use saved password"
 - inputText: "passcode"
 - pressKey: Enter
 

.maestro/setup_ui_tests.sh

@@ -18,8 +18,8 @@ check_maestro() {
     local known_version="1.36.0"
 
     if command -v $command_name > /dev/null 2>&1; then
-      local version_output=$($command_name -v 2>&1)
-      
+      local version_output=$($command_name -v 2>&1 | tail -n 1)
+
       local command_version=$(echo $version_output | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
 
       if [[ $command_version == $known_version ]]; then

.xcode-version

@@ -1 +1 @@
-15.2
+15.4

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.130.0
+MARKETING_VERSION = 7.131.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"6731933419540cb11a6a0898b0c26bdb\""
-        public static let embeddedDataSHA = "88b018fcabee20e6a210d3c65f122c0019ca5bb900c9a0148945e4c4c609856d"
+        public static let embeddedDataETag = "\"fe3d3799b2bb2167720194f93ada4e43\""
+        public static let embeddedDataSHA = "4039eb5c4fcaa8806f0058b70c96e25db5d21c481e3ad607393726eb9cb0c361"
     }
 
     public var embeddedDataEtag: String {

Core/DefaultVariantManager.swift

@@ -40,13 +40,6 @@ public struct VariantIOS: Variant {
                 .contains(where: { Locale.current.regionCode == $0 }) }
 
         static let inEnglish = { return Locale.current.languageCode == "en" }
-
-        static let iOS15 = { () -> Bool in
-            if #available(iOS 15, *) {
-                return true
-            }
-            return false
-        }
     }
 
     /// This variant is used for returning users to separate them from really new users.

Core/FeatureFlag.swift

@@ -29,6 +29,7 @@ public enum FeatureFlag: String {
     case autofillAccessCredentialManagement
     case autofillPasswordGeneration
     case autofillOnByDefault
+    case autofillFailureReporting
     case incontextSignup
     case autoconsentOnByDefault
     case history
@@ -55,6 +56,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutofillSubfeature.autofillPasswordGeneration))
         case .autofillOnByDefault:
             return .remoteReleasable(.subfeature(AutofillSubfeature.onByDefault))
+        case .autofillFailureReporting:
+            return .remoteReleasable(.feature(.autofillBreakageReporter))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
         case .autoconsentOnByDefault:

Core/PixelEvent.swift

@@ -201,8 +201,6 @@ extension Pixel {
 
         case downloadsSharingPredownloadedLocalFile
 
-        case downloadAttemptToOpenBLOBviaJS
-
         case jsAlertShown
 
         case featureFlaggingInternalUserAuthenticated
@@ -280,6 +278,11 @@ extension Pixel {
         case autofillManagementUpdateLogin
 
         case autofillMultipleAuthCallsTriggered
+        case autofillLoginsReportFailure
+        case autofillLoginsReportAvailable
+        case autofillLoginsReportConfirmationPromptDisplayed
+        case autofillLoginsReportConfirmationPromptConfirmed
+        case autofillLoginsReportConfirmationPromptDismissed
 
         case getDesktopCopy
         case getDesktopShare
@@ -726,16 +729,10 @@ extension Pixel {
         case duckPlayerOverlayYoutubeImpressions
         case duckPlayerOverlayYoutubeWatchHere
         case duckPlayerSettingAlwaysDuckPlayer
-        case duckPlayerSettingAlwaysOverlaySERP
-        case duckPlayerSettingAlwaysOverlayYoutube
         case duckPlayerSettingAlwaysSettings
-        case duckPlayerSettingNeverOverlaySERP
-        case duckPlayerSettingNeverOverlayYoutube
         case duckPlayerSettingNeverSettings
         case duckPlayerSettingBackToDefault
         case duckPlayerWatchOnYoutube
-        case watchInDuckPlayerInitial
-
     }
 
 }
@@ -920,8 +917,6 @@ extension Pixel.Event {
 
         case .downloadsSharingPredownloadedLocalFile: return "m_downloads_sharing_predownloaded_local_file"
 
-        case .downloadAttemptToOpenBLOBviaJS: return "m_download_attempt_to_open_blob_js"
-
         case .jsAlertShown: return "m_js_alert_shown"
 
         case .featureFlaggingInternalUserAuthenticated: return "m_internal-user_authenticated"
@@ -1013,6 +1008,11 @@ extension Pixel.Event {
             return "m_autofill_management_update_login"
 
         case .autofillMultipleAuthCallsTriggered: return "m_autofill_multiple_auth_calls_triggered"
+        case .autofillLoginsReportFailure: return "autofill_logins_report_failure"
+        case .autofillLoginsReportAvailable: return "autofill_logins_report_available"
+        case .autofillLoginsReportConfirmationPromptDisplayed: return "autofill_logins_report_confirmation_prompt_displayed"
+        case .autofillLoginsReportConfirmationPromptConfirmed: return "autofill_logins_report_confirmation_prompt_confirmed"
+        case .autofillLoginsReportConfirmationPromptDismissed: return "autofill_logins_report_confirmation_prompt_dismissed"
 
         case .getDesktopCopy: return "m_get_desktop_copy"
         case .getDesktopShare: return "m_get_desktop_share"
@@ -1448,17 +1448,12 @@ extension Pixel.Event {
         case .duckPlayerViewFromSERP: return "m_duck-player_view-from_serp"
         case .duckPlayerViewFromOther: return "m_duck-player_view-from_other"
         case .duckPlayerSettingAlwaysSettings: return "m_duck-player_setting_always_settings"
+        case .duckPlayerSettingAlwaysDuckPlayer: return "m_duck-player_setting_always_duck-player"
         case .duckPlayerOverlayYoutubeImpressions: return "m_duck-player_overlay_youtube_impressions"
         case .duckPlayerOverlayYoutubeWatchHere: return "m_duck-player_overlay_youtube_watch_here"
-        case .duckPlayerSettingAlwaysDuckPlayer: return "m_duck-player_setting_always_duck-player"
-        case .duckPlayerSettingAlwaysOverlaySERP: return "m_duck-player_setting_always_overlay_serp"
-        case .duckPlayerSettingAlwaysOverlayYoutube: return "m_duck-player_setting_always_overlay_youtube"
-        case .duckPlayerSettingNeverOverlaySERP: return "m_duck-player_setting_never_overlay_serp"
-        case .duckPlayerSettingNeverOverlayYoutube: return "m_duck-player_setting_never_overlay_youtube"
         case .duckPlayerSettingNeverSettings: return "m_duck-player_setting_never_settings"
         case .duckPlayerSettingBackToDefault: return "m_duck-player_setting_back-to-default"
         case .duckPlayerWatchOnYoutube: return "m_duck-player_watch_on_youtube"
-        case .watchInDuckPlayerInitial: return "m_watch-in-duckplayer_initial_u"
         }
     }
 }

Core/UserDefaults+NetworkProtection.swift

@@ -17,8 +17,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 
 public extension UserDefaults {
@@ -36,5 +34,3 @@ public enum NetworkProtectionUserDefaultKeys {
     public static let lastSelectedServerCity = "com.duckduckgo.network-protection.last-selected-server-city"
 
 }
-
-#endif

Core/UserDefaultsPropertyWrapper.swift

@@ -150,10 +150,13 @@ public struct UserDefaultsWrapper<T> {
 
         case duckPlayerMode = "com.duckduckgo.ios.duckPlayerMode"
         case duckPlayerAskModeOverlayHidden = "com.duckduckgo.ios.duckPlayerAskModeOverlayHidden"
-
+        case userInteractedWithDuckPlayer = "com.duckduckgo.ios.userInteractedWithDuckPlayer"
+
         case vpnRedditWorkaroundInstalled = "com.duckduckgo.ios.vpn.workaroundInstalled"
 
-
+        case newTabPageSectionsSettings = "com.duckduckgo.ios.newTabPage.sections.settings"
+        case newTabPageShortcutsSettings = "com.duckduckgo.ios.newTabPage.shortcuts.settings"
+
         // Debug keys
 
         case debugNewTabPageSectionsEnabledKey = "com.duckduckgo.ios.debug.newTabPageSectionsEnabled"