Merge branch 'main' into sam/add-rmf-message-shown-attribute

# By Alexey Martemyanov (2) and others
# Via Alexey Martemyanov (2) and GitHub (1)
* main:
  Enable favorites reordering on New Tab Page (#3169)
  [DuckPlayer]. 15. Move DuckPlayer code to BSK (#3171)
  Update autoconsent to v10.13.0 (#3178)
  application lock test and tab switcher test (#3163)
  Release 7.131.0-1 (#3179)
  restore CrashLogMessageExtractor with disabled __cxa_throw swapper (#3133)

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

.maestro/release_tests/application-lock.yaml

@@ -0,0 +1,57 @@
+# application-lock.yaml
+appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
+---
+
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
+
+- tapOn: "Settings"
+- scrollUntilVisible:
+    element: "General"
+    direction: DOWN
+- tapOn: "General"
+
+- tapOn:
+    text: "0"
+    index: "0"
+
+- stopApp
+
+- launchApp
+
+- assertVisible: "Unlock DuckDuckGo."
+- inputText: "password"
+- pressKey: Enter
+
+- assertVisible:
+    id: "searchEntry"
+- tapOn: 
+    id: "searchEntry"
+- inputText: "https://privacy-test-pages.site"
+- pressKey: Enter
+
+# Manage onboarding
+- runFlow:
+    file: ../shared/onboarding_browsing.yaml
+
+- tapOn: "Browsing Menu"
+- tapOn: "Settings"
+- scrollUntilVisible:
+    element: "General"
+    direction: DOWN
+- tapOn: "General"
+
+- tapOn:
+    text: "1"
+    index: "0"
+
+
+- stopApp
+
+- launchApp
+
+- assertVisible: "Privacy Test Pages"

.maestro/release_tests/tabswitcher.yaml

@@ -0,0 +1,60 @@
+# tabswitcher.yaml
+appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
+---
+
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
+
+# Load Site
+- assertVisible:
+    id: "searchEntry"
+- tapOn: 
+    id: "searchEntry"
+- inputText: "https://privacy-test-pages.site"
+- pressKey: Enter
+
+# Manage onboarding
+- runFlow:
+    file: ../shared/onboarding_browsing.yaml
+
+- assertVisible: ".*Privacy Test Pages.*"
+
+# Add tab
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
+- assertVisible: ".*Privacy Test Pages.*"
+- assertVisible: 
+    id: "Add"
+- tapOn:
+    id: "Add"
+- assertVisible:
+    id: "searchEntry"
+- tapOn: 
+    id: "searchEntry"
+- inputText: "https://www.search-company.site"
+- pressKey: Enter
+- assertVisible: "Search engine"
+
+# Bookmark all
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
+- tapOn: "Add all tabs as bookmarks"
+- assertVisible: "Bookmark All Tabs?"
+- tapOn: "Bookmark"
+
+# can't really tell if it works, but at least it won't crash
+- tapOn: "Toggle between grid and list view"
+
+# Check bookmarks were added
+- tapOn: "Done"
+
+- tapOn: "Browsing menu"
+- tapOn: "Bookmarks"
+- assertVisible: "Privacy Test Pages - Home"
+- assertVisible: "Ad Click Flow"
+
+

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "branch" : "sam/add-rmf-message-shown-attribute",
-        "revision" : "eed68fe76825b427a2fbc10435b4df1a9bf2737b"
+        "revision" : "ebad3db46e09913ac4c0e0c62085dcb40a6d6253",
+        "version" : "178.0.0"
       }
     },
     {

DuckDuckGo/AddressDisplayHelper.swift

@@ -18,6 +18,7 @@
 //
 
 import Foundation
+import DuckPlayer
 
 extension OmniBar {
 

DuckDuckGo/AppDelegate.swift

@@ -100,6 +100,12 @@ import WebKit
 
     override init() {
         super.init()
+
+        if !didCrashDuringCrashHandlersSetUp {
+            didCrashDuringCrashHandlersSetUp = true
+            CrashLogMessageExtractor.setUp(swapCxaThrow: false)
+            didCrashDuringCrashHandlersSetUp = false
+        }
     }
 
     // swiftlint:disable:next function_body_length

DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift

@@ -23,6 +23,7 @@ import WebKit
 import Core
 import Common
 import BrowserServicesKit
+import DuckPlayer
 
 final class DuckPlayerNavigationHandler {
 

DuckDuckGo/DuckPlayer/YoutubeOverlayUserScript.swift

@@ -24,6 +24,7 @@ import UserScript
 import Combine
 import Core
 import BrowserServicesKit
+import DuckPlayer
 
 final class YoutubeOverlayUserScript: NSObject, Subfeature {
 

DuckDuckGo/Favorite.swift

@@ -20,7 +20,7 @@
 import Bookmarks
 import SwiftUI
 
-struct Favorite: Identifiable, Equatable {
+struct Favorite: Identifiable, Equatable, Hashable {
     let id: String
     let title: String
     let domain: String

DuckDuckGo/FavoritesDefaultModel.swift

@@ -114,6 +114,19 @@ final class FavoritesDefaultModel: FavoritesModel {
         onFavoriteEdit?(entity)
     }
 
+    func moveFavorites(from indexSet: IndexSet, to index: Int) {
+        guard indexSet.count == 1,
+              let fromIndex = indexSet.first else { return }
+
+        let favorite = allFavorites[fromIndex]
+        guard let entity = lookupEntity(for: favorite) else { return }
+
+        // adjust for different target index handling
+        let toIndex = index > fromIndex ? index - 1 : index
+        interactionModel.moveFavorite(entity, fromIndex: fromIndex, toIndex: toIndex)
+        allFavorites.move(fromOffsets: IndexSet(integer: fromIndex), toOffset: index)
+    }
+
     private func lookupEntity(for favorite: Favorite) -> BookmarkEntity? {
         interactionModel.favorites.first {
             $0.uuid == favorite.id

DuckDuckGo/FavoritesModel.swift

@@ -37,6 +37,7 @@ protocol FavoritesModel: AnyObject, ObservableObject {
     func favoriteSelected(_ favorite: Favorite)
     func editFavorite(_ favorite: Favorite)
     func deleteFavorite(_ favorite: Favorite)
+    func moveFavorites(from indexSet: IndexSet, to index: Int)
 }
 
 struct FavoritesSlice {

DuckDuckGo/FavoritesPreviewModel.swift

@@ -71,6 +71,10 @@ final class FavoritesPreviewModel: FavoritesModel {
 
     }
 
+    func moveFavorites(from indexSet: IndexSet, to index: Int) {
+        allFavorites.move(fromOffsets: indexSet, toOffset: index)
+    }
+
     func loadFavicon(for favorite: Favorite, size: CGFloat) async {
 
     }