Code Review Bench PR #31547 - Refactor FXIOS-13122 [Swift 6] Remove @Sendable from closures marked as @MainActor

BrowserKit/Sources/Common/Utilities/DispatchQueueHelper.swift

@@ -7,7 +7,7 @@ import Foundation
 // Only push the task async if we are not already on the main thread.
 // Unless you want another event to fire before your work happens.
 // This is better than using DispatchQueue.main.async to ensure main thread
-public func ensureMainThread(execute work: @escaping @MainActor @Sendable @convention(block) () -> Swift.Void) {
+public func ensureMainThread(execute work: @escaping @MainActor @convention(block) () -> Swift.Void) {
     if Thread.isMainThread {
         MainActor.assumeIsolated {
             work()
@@ -19,14 +19,15 @@ public func ensureMainThread(execute work: @escaping @MainActor @Sendable @conve
     }
 }
 
-public func ensureMainThread<T>(execute work: @escaping @MainActor @Sendable () -> T) {
+public func ensureMainThread<T>(execute work: @escaping @MainActor () -> T) -> T? {
     if Thread.isMainThread {
-        MainActor.assumeIsolated {
-            _ = work()
+        return MainActor.assumeIsolated {
+            return work()
         }
     } else {
         DispatchQueue.main.async {
             _ = work()
         }
+        return nil
     }
 }

BrowserKit/Sources/Common/Utilities/DispatchQueueInterface.swift

@@ -10,7 +10,7 @@ public protocol DispatchQueueInterface: Sendable {
                flags: DispatchWorkItemFlags,
                execute work: @escaping @Sendable @convention(block) () -> Void)
 
-    func ensureMainThread(execute work: @escaping @MainActor @Sendable @convention(block) () -> Swift.Void)
+    func ensureMainThread(execute work: @escaping @MainActor @convention(block) () -> Swift.Void)
 
     func asyncAfter(deadline: DispatchTime, execute: DispatchWorkItem)
 
@@ -35,7 +35,7 @@ extension DispatchQueueInterface {
         asyncAfter(deadline: deadline, qos: qos, flags: flags, execute: work)
     }
 
-    public func ensureMainThread(execute work: @escaping @MainActor @Sendable @convention(block) () -> Swift.Void) {
+    public func ensureMainThread(execute work: @escaping @MainActor @convention(block) () -> Swift.Void) {
         if Thread.isMainThread {
             MainActor.assumeIsolated {
                 work()

BrowserKit/Sources/MenuKit/MenuElement.swift

@@ -17,7 +17,7 @@ public struct MenuElement: Equatable, Sendable {
     let a11yId: String
     let isOptional: Bool
     let infoTitle: String?
-    public let action: (@MainActor @Sendable () -> Void)?
+    public let action: (@MainActor () -> Void)?
 
     // We need this init as by default the init generated by the compiler
     // for the struct will be internal and can not be used outside of MenuKit
@@ -34,7 +34,7 @@ public struct MenuElement: Equatable, Sendable {
         a11yId: String,
         isOptional: Bool = false,
         infoTitle: String? = nil,
-        action: (@MainActor @Sendable () -> Void)?
+        action: (@MainActor () -> Void)?
     ) {
         self.title = title
         self.description = description

BrowserKit/Sources/Redux/Reducer.swift

@@ -6,4 +6,4 @@ import Foundation
 
 /// Provide pure functions, that based on the current `Action` and the current app `State`,
 /// create a new app state. `Reducers` are the only place in which the application state should be modified.
-public typealias Reducer<State> = @Sendable @MainActor (State, Action) -> State
+public typealias Reducer<State> = @MainActor (State, Action) -> State

BrowserKit/Sources/Shared/UIDeviceDetails.swift

@@ -36,7 +36,7 @@ public struct UIDeviceDetails {
     /// **DO NOT USE THIS METHOD ELSEWHERE IN THE CODE BASE.**
     /// This is a workaround to access unchanging `UIDevice.current` values that Apple has needlessly main actor-isolated.
     private static func getMainThreadDataSynchronously<T: Sendable>(
-        work: @MainActor @Sendable () -> (T)
+        work: @MainActor () -> (T)
     ) -> T {
         if Thread.isMainThread {
             MainActor.assumeIsolated {

BrowserKit/Sources/WebEngine/WKWebview/WKEngineWebView.swift

@@ -75,7 +75,7 @@ protocol WKEngineWebView: UIView {
         _ javaScript: String,
         in frame: WKFrameInfo?,
         in contentWorld: WKContentWorld,
-        completionHandler: (@MainActor @Sendable (Result<Any, Error>) -> Void)?
+        completionHandler: (@MainActor (Result<Any, Error>) -> Void)?
     )
 
     func close()
@@ -86,7 +86,7 @@ extension WKEngineWebView {
         _ javaScript: String,
         in frame: WKFrameInfo? = nil,
         in contentWorld: WKContentWorld,
-        completionHandler: (@MainActor @Sendable (Result<Any, Error>) -> Void)? = nil
+        completionHandler: (@MainActor (Result<Any, Error>) -> Void)? = nil
     ) {
         evaluateJavaScript(javaScript,
                            in: frame,

BrowserKit/Tests/WebEngineTests/Mock/MockWKEngineWebView.swift

@@ -136,7 +136,7 @@ class MockWKEngineWebView: UIView, WKEngineWebView {
     func evaluateJavaScript(_ javaScript: String,
                             in frame: WKFrameInfo?,
                             in contentWorld: WKContentWorld,
-                            completionHandler: (@MainActor @Sendable (Result<Any, Error>) -> Void)?) {
+                            completionHandler: (@MainActor (Result<Any, Error>) -> Void)?) {
         evaluateJavaScriptCalled += 1
         savedJavaScript = javaScript
 

firefox-ios/Client/AccountSyncHandler.swift

@@ -16,7 +16,7 @@ final class Debouncer {
         self.delay = delay
     }
 
-    func call(action: @escaping @MainActor @Sendable () -> Void) {
+    func call(action: @escaping @MainActor () -> Void) {
         task?.cancel()
 
         let nanos = UInt64(delay) * nanosecondsPerSecond

firefox-ios/Client/Application/WebServer.swift

@@ -15,7 +15,7 @@ protocol WebServerProtocol {
 
 /// FIXME: FXIOS-13989 Make truly thread safe
 /// NOTE: FXIOS-14560 -- Be careful; `@MainActor` will cause crashes with GCDWebServer dependency.
-final class WebServer: WebServerProtocol, @unchecked Sendable {
+class WebServer: WebServerProtocol, @unchecked Sendable {
     static let sharedInstance = WebServer()
 
     private let logger: Logger
@@ -56,7 +56,7 @@ final class WebServer: WebServerProtocol, @unchecked Sendable {
         _ method: String,
         module: String,
         resource: String,
-        handler: @escaping @Sendable @MainActor (
+        handler: @escaping @MainActor (
             _ request: GCDWebServerRequest?,
             _ responseCompletion: @escaping @Sendable (GCDWebServerResponse?) -> Void
         ) -> Void

firefox-ios/Client/Frontend/AuthenticationManager/AppAuthenticator.swift

@@ -19,14 +19,14 @@ enum AuthenticationState {
 protocol AppAuthenticationProtocol {
     var canAuthenticateDeviceOwner: Bool { get }
 
-    func getAuthenticationState(completion: @MainActor @escaping @Sendable (AuthenticationState) -> Void)
+    func getAuthenticationState(completion: @MainActor @escaping (AuthenticationState) -> Void)
     func authenticateWithDeviceOwnerAuthentication(
-        _ completion: @MainActor @escaping @Sendable (Result<Void, AuthenticationError>) -> Void
+        _ completion: @MainActor @escaping (Result<Void, AuthenticationError>) -> Void
     )
 }
 
 class AppAuthenticator: AppAuthenticationProtocol {
-    func getAuthenticationState(completion: @MainActor @escaping @Sendable (AuthenticationState) -> Void) {
+    func getAuthenticationState(completion: @MainActor @escaping (AuthenticationState) -> Void) {
         if canAuthenticateDeviceOwner {
             authenticateWithDeviceOwnerAuthentication { result in
                 DispatchQueue.main.async {
@@ -46,7 +46,7 @@ class AppAuthenticator: AppAuthenticationProtocol {
     }
 
     func authenticateWithDeviceOwnerAuthentication(
-        _ completion: @MainActor @escaping @Sendable (Result<Void, AuthenticationError>) -> Void
+        _ completion: @MainActor @escaping (Result<Void, AuthenticationError>) -> Void
     ) {
         // Get a fresh context for each login. If you use the same context on multiple attempts
         //  (by commenting out the next line), then a previously successful authentication

firefox-ios/Client/Frontend/Autofill/CreditCard/CreditCardSettingsView/CreditCardInputViewModel.swift

@@ -256,7 +256,7 @@ final class CreditCardInputViewModel: ObservableObject, @unchecked Sendable {
     }
 
     func removeCreditCard(creditCard: CreditCard?,
-                          completion: @escaping @MainActor @Sendable (CreditCardModifiedStatus, Bool) -> Void) {
+                          completion: @escaping @MainActor (CreditCardModifiedStatus, Bool) -> Void) {
         guard let currentCreditCard = creditCard,
               !currentCreditCard.guid.isEmpty else {
             ensureMainThread {

firefox-ios/Client/Frontend/Browser/BrowserViewController/Actions/WebContextMenuActionsProvider.swift

@@ -28,7 +28,7 @@ class WebContextMenuActionsProvider {
     }
 
     @MainActor
-    func addOpenInNewTab(url: URL, currentTab: Tab, addTab: @escaping @MainActor @Sendable (URL, Bool, Tab) -> Void) {
+    func addOpenInNewTab(url: URL, currentTab: Tab, addTab: @escaping @MainActor (URL, Bool, Tab) -> Void) {
         actions.append(
             UIAction(
                 title: .ContextMenuOpenInNewTab,
@@ -41,7 +41,7 @@ class WebContextMenuActionsProvider {
     }
 
     @MainActor
-    func addOpenInNewPrivateTab(url: URL, currentTab: Tab, addTab: @escaping @MainActor @Sendable (URL, Bool, Tab) -> Void) {
+    func addOpenInNewPrivateTab(url: URL, currentTab: Tab, addTab: @escaping @MainActor (URL, Bool, Tab) -> Void) {
         actions.append(
             UIAction(
                 title: .ContextMenuOpenInNewPrivateTab,
@@ -161,7 +161,7 @@ class WebContextMenuActionsProvider {
     @MainActor
     func addSaveImage(url: URL,
                       getImageData: @escaping (URL, @Sendable @escaping (Data) -> Void) -> Void,
-                      writeToPhotoAlbum: @escaping @Sendable @MainActor (UIImage) -> Void) {
+                      writeToPhotoAlbum: @escaping @MainActor (UIImage) -> Void) {
         actions.append(UIAction(
             title: .ContextMenuSaveImage,
             identifier: UIAction.Identifier("linkContextMenu.saveImage")

firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift

@@ -76,7 +76,7 @@ extension BrowserViewController: WKUIDelegate {
     private func handleJavaScriptAlert<T: WKJavaScriptAlertInfo>(
         _ alert: T,
         for webView: WKWebView,
-        spamCallback: @escaping @MainActor @Sendable () -> Void
+        spamCallback: @escaping @MainActor () -> Void
     ) {
         if jsAlertExceedsSpamLimits(webView) {
             handleSpammedJSAlert(spamCallback)
@@ -95,7 +95,7 @@ extension BrowserViewController: WKUIDelegate {
         _ webView: WKWebView,
         runJavaScriptAlertPanelWithMessage message: String,
         initiatedByFrame frame: WKFrameInfo,
-        completionHandler: @escaping @MainActor @Sendable () -> Void
+        completionHandler: @escaping @MainActor () -> Void
     ) {
         let messageAlert = MessageAlert(message: message,
                                         frame: frame,
@@ -110,7 +110,7 @@ extension BrowserViewController: WKUIDelegate {
         _ webView: WKWebView,
         runJavaScriptConfirmPanelWithMessage message: String,
         initiatedByFrame frame: WKFrameInfo,
-        completionHandler: @escaping @MainActor @Sendable (Bool) -> Void
+        completionHandler: @escaping @MainActor (Bool) -> Void
     ) {
         let confirmAlert = ConfirmPanelAlert(message: message, frame: frame) { confirm in
             self.logger.log("JavaScript confirm panel was completed with result: \(confirm)", level: .info, category: .webview)
@@ -127,7 +127,7 @@ extension BrowserViewController: WKUIDelegate {
         runJavaScriptTextInputPanelWithPrompt prompt: String,
         defaultText: String?,
         initiatedByFrame frame: WKFrameInfo,
-        completionHandler: @escaping @MainActor @Sendable (String?) -> Void
+        completionHandler: @escaping @MainActor (String?) -> Void
     ) {
         let textInputAlert = TextInputAlert(message: prompt, frame: frame, defaultText: defaultText) { input in
             self.logger.log("JavaScript text input panel was completed with input", level: .info, category: .webview)
@@ -153,7 +153,7 @@ extension BrowserViewController: WKUIDelegate {
     func webView(
         _ webView: WKWebView,
         contextMenuConfigurationForElement elementInfo: WKContextMenuElementInfo,
-        completionHandler: @escaping @MainActor @Sendable (UIContextMenuConfiguration?) -> Void
+        completionHandler: @escaping @MainActor (UIContextMenuConfiguration?) -> Void
     ) {
         guard let url = elementInfo.linkURL,
               let currentTab = tabManager.selectedTab,
@@ -184,7 +184,7 @@ extension BrowserViewController: WKUIDelegate {
         requestMediaCapturePermissionFor origin: WKSecurityOrigin,
         initiatedByFrame frame: WKFrameInfo,
         type: WKMediaCaptureType,
-        decisionHandler: @escaping @MainActor @Sendable (WKPermissionDecision) -> Void
+        decisionHandler: @escaping @MainActor (WKPermissionDecision) -> Void
     ) {
         // If the tab isn't the selected one or we're on the homepage, do not show the media capture prompt
         guard tabManager.selectedTab?.webView === webView, !contentContainer.hasAnyHomepage else {
@@ -197,7 +197,7 @@ extension BrowserViewController: WKUIDelegate {
 
     // MARK: - Helpers
 
-    private func handleSpammedJSAlert(_ callback: @escaping @MainActor @Sendable () -> Void) {
+    private func handleSpammedJSAlert(_ callback: @escaping @MainActor () -> Void) {
         // User is being spammed. Squelch alert. Note that we have to do this after
         // a delay to avoid JS that could spin the CPU endlessly.
         DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) { callback() }
@@ -312,7 +312,7 @@ extension BrowserViewController: WKUIDelegate {
 
     func createActions(isPrivate: Bool,
                        url: URL,
-                       addTab: @escaping @MainActor @Sendable (URL, Bool, Tab) -> Void,
+                       addTab: @escaping @MainActor (URL, Bool, Tab) -> Void,
                        title: String?,
                        image: URL?,
                        currentTab: Tab,
@@ -705,7 +705,7 @@ extension BrowserViewController: WKNavigationDelegate {
     func webView(
         _ webView: WKWebView,
         decidePolicyFor navigationResponse: WKNavigationResponse,
-        decisionHandler: @escaping @MainActor @Sendable (WKNavigationResponsePolicy) -> Void
+        decisionHandler: @escaping @MainActor (WKNavigationResponsePolicy) -> Void
     ) {
         let response = navigationResponse.response
         let responseURL = response.url
@@ -928,7 +928,7 @@ extension BrowserViewController: WKNavigationDelegate {
         // web view don't invoke another download.
         pendingDownloadWebView = nil
 
-        let downloadAction: @Sendable @MainActor (HTTPDownload) -> Void = { [weak self] download in
+        let downloadAction: @MainActor (HTTPDownload) -> Void = { [weak self] download in
             self?.downloadQueue.enqueue(download)
         }
 
@@ -1053,7 +1053,7 @@ extension BrowserViewController: WKNavigationDelegate {
     func webView(
         _ webView: WKWebView,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping @MainActor @Sendable (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
+        completionHandler: @escaping @MainActor (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
     ) {
         guard challenge.protectionSpace.authenticationMethod != NSURLAuthenticationMethodServerTrust else {
             handleServerTrust(
@@ -1232,7 +1232,7 @@ private extension BrowserViewController {
 
     // Use for sms and mailto, which do not show a confirmation before opening.
     func showExternalAlert(withText text: String,
-                           completion: @escaping @MainActor @Sendable (UIAlertAction) -> Void) {
+                           completion: @escaping @MainActor (UIAlertAction) -> Void) {
         let alert = UIAlertController(title: nil,
                                       message: text,
                                       preferredStyle: .alert)
@@ -1329,7 +1329,7 @@ private extension BrowserViewController {
     func handleServerTrust(
         challenge: URLAuthenticationChallenge,
         dispatchQueue: DispatchQueueInterface,
-        completionHandler: @escaping @MainActor @Sendable (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
+        completionHandler: @escaping @MainActor (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
     ) {
         dispatchQueue.async {
             // If this is a certificate challenge, see if the certificate has previously been
@@ -1340,9 +1340,7 @@ private extension BrowserViewController {
                   let cert = SecTrustCopyCertificateChain(trust) as? [SecCertificate],
                   self.profile.certStore.containsCertificate(cert[0], forOrigin: origin)
             else {
-                ensureMainThread {
-                    completionHandler(.performDefaultHandling, nil)
-                }
+                completionHandler(.performDefaultHandling, nil)
                 return
             }
 

firefox-ios/Client/Frontend/Browser/BrowserViewController/WebEngineIntegration/BrowserWebUIDelegate.swift

@@ -53,7 +53,7 @@ class BrowserWebUIDelegate: NSObject, WKUIDelegate {
         _ webView: WKWebView,
         runJavaScriptConfirmPanelWithMessage message: String,
         initiatedByFrame frame: WKFrameInfo,
-        completionHandler: @escaping @MainActor @Sendable (Bool) -> Void
+        completionHandler: @escaping @MainActor (Bool) -> Void
     ) {
         legacyResponder?.webView?(
             webView,
@@ -68,7 +68,7 @@ class BrowserWebUIDelegate: NSObject, WKUIDelegate {
         runJavaScriptTextInputPanelWithPrompt prompt: String,
         defaultText: String?,
         initiatedByFrame frame: WKFrameInfo,
-        completionHandler: @escaping @MainActor @Sendable (String?) -> Void
+        completionHandler: @escaping @MainActor (String?) -> Void
     ) {
         legacyResponder?.webView?(
             webView,
@@ -86,7 +86,7 @@ class BrowserWebUIDelegate: NSObject, WKUIDelegate {
     func webView(
         _ webView: WKWebView,
         contextMenuConfigurationForElement elementInfo: WKContextMenuElementInfo,
-        completionHandler: @escaping @MainActor @Sendable (UIContextMenuConfiguration?) -> Void
+        completionHandler: @escaping @MainActor (UIContextMenuConfiguration?) -> Void
     ) {
         legacyResponder?.webView?(
             webView,
@@ -104,7 +104,7 @@ class BrowserWebUIDelegate: NSObject, WKUIDelegate {
         requestMediaCapturePermissionFor origin: WKSecurityOrigin,
         initiatedByFrame frame: WKFrameInfo,
         type: WKMediaCaptureType,
-        decisionHandler: @escaping @MainActor @Sendable (WKPermissionDecision) -> Void
+        decisionHandler: @escaping @MainActor (WKPermissionDecision) -> Void
     ) {
         legacyResponder?.webView?(
             webView,

firefox-ios/Client/Frontend/Browser/DownloadHelper/DownloadHelper.swift

@@ -62,7 +62,7 @@ class DownloadHelper: NSObject {
 
     @MainActor
     func downloadViewModel(windowUUID: WindowUUID,
-                           okAction: @Sendable @MainActor @escaping (HTTPDownload) -> Void) -> PhotonActionSheetViewModel? {
+                           okAction: @MainActor @escaping (HTTPDownload) -> Void) -> PhotonActionSheetViewModel? {
         var requestUrl = request.url
         if let url = requestUrl, url.scheme == "blob" {
             requestUrl = url.removeBlobFromUrl()