renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delete no-longer-needed (due to OS changes) UTS46 URL handling.

Browse Source
This commit is contained in:
Brent Simmons
2024-11-09 10:23:13 -08:00
parent 2b76968391
commit 05347129bf
14 changed files with 17 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Browser.swift
View File

@@ -43,7 +43,7 @@ struct Browser {
/// - Note: Some browsers (specifically Chromium-derived ones) will ignore the request
/// to open in the background.
static func open(_ urlString: String, inBackground: Bool) {
guard let url = URL(unicodeString: urlString), let preparedURL = url.preparedForOpeningInBrowser() else { return }
guard let url = URL(string: urlString), let preparedURL = url.preparedForOpeningInBrowser() else { return }
let configuration = NSWorkspace.OpenConfiguration()
configuration.requiresUniversalLinks = true

4
Mac/Inspector/FeedInspectorViewController.swift
View File

@@ -162,11 +162,11 @@ private extension FeedInspectorViewController {
}
func updateHomePageURL() {
homePageURLTextField?.stringValue = feed?.homePageURL?.decodedURLString ?? ""
homePageURLTextField?.stringValue = feed?.homePageURL ?? ""
}
func updateFeedURL() {
urlTextField?.stringValue = feed?.url.decodedURLString ?? ""
urlTextField?.stringValue = feed?.url ?? ""
}
func updateNotifyAboutNewArticles() {

2
Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
View File

@@ -91,7 +91,7 @@ final class AddFeedWindowController : NSWindowController {
cancelSheet()
return;
}
guard let url = URL(unicodeString: normalizedURLString) else {
guard let url = URL(string: normalizedURLString) else {
cancelSheet()
return
}

6
Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
View File

@@ -216,16 +216,16 @@ private extension SidebarViewController {
}
if let homePageURL = feed.homePageURL, let _ = URL(string: homePageURL) {
let item = menuItem(NSLocalizedString("Open Home Page", comment: "Command"), #selector(openHomePageFromContextualMenu(_:)), homePageURL.decodedURLString ?? homePageURL)
let item = menuItem(NSLocalizedString("Open Home Page", comment: "Command"), #selector(openHomePageFromContextualMenu(_:)), homePageURL)
menu.addItem(item)
menu.addItem(NSMenuItem.separator())
}
let copyFeedURLItem = menuItem(NSLocalizedString("Copy Feed URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), feed.url.decodedURLString ?? feed.url)
let copyFeedURLItem = menuItem(NSLocalizedString("Copy Feed URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), feed.url)
menu.addItem(copyFeedURLItem)
if let homePageURL = feed.homePageURL {
let item = menuItem(NSLocalizedString("Copy Home Page URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), homePageURL.decodedURLString ?? homePageURL)
let item = menuItem(NSLocalizedString("Copy Home Page URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), homePageURL)
menu.addItem(item)
}
menu.addItem(NSMenuItem.separator())