FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-09 08:23:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some deprecation warnings in MacWebBrowser.

Browse Source
This commit is contained in:
Brent Simmons 2024-04-06 22:13:50 -07:00
parent bd077687c1
commit 35f7798532
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Web/Sources/Web/MacWebBrowser.swift
View File

@ -9,7 +9,7 @@
#if os(macOS)
import AppKit
public class MacWebBrowser {
@MainActor public class MacWebBrowser {
/// Opens a URL in the default browser.
@discardableResult public class func openURL(_ url: URL, inBackground: Bool = false) -> Bool {
@ -22,7 +22,7 @@ public class MacWebBrowser {
if (inBackground) {
Task {
Task { @MainActor in
let configuration = NSWorkspace.OpenConfiguration()
configuration.activates = false
_ = try? await NSWorkspace.shared.open(url, configuration: configuration)
@ -130,25 +130,24 @@ public class MacWebBrowser {
/// - url: The URL to open.
/// - inBackground: If `true`, attempt to load the URL without bringing the browser to the foreground.
@discardableResult public func openURL(_ url: URL, inBackground: Bool = false) -> Bool {
// TODO: make this function async.
guard let preparedURL = url.preparedForOpeningInBrowser() else {
return false
}
let options: NSWorkspace.LaunchOptions = inBackground ? [.withoutActivation] : []
Task { @MainActor in
return NSWorkspace.shared.open([preparedURL], withAppBundleIdentifier: self.bundleIdentifier, options: options, additionalEventParamDescriptor: nil, launchIdentifiers: nil)
}
let configuration = NSWorkspace.OpenConfiguration()
if inBackground {
configuration.activates = false
}
}
extension MacWebBrowser: CustomDebugStringConvertible {
public var debugDescription: String {
if let name = name, let bundleIdentifier = bundleIdentifier{
return "MacWebBrowser: \(name) (\(bundleIdentifier))"
} else {
return "MacWebBrowser"
_ = try? await NSWorkspace.shared.open([preparedURL], withApplicationAt: self.url, configuration: configuration)
}
return true
}
}