Skip to content

Fix default browser detection using malformed URL NSWorkspace.urlForA… #5224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umutkonmus wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −4
Open

Fix default browser detection using malformed URL NSWorkspace.urlForA… #5224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Mac/Preferences/General/GeneralPrefencesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ private extension GeneralPreferencesViewController {
let defaultBrowser = MacWebBrowser.default

let defaultBrowserFormat = NSLocalizedString("System Default (%@)", comment: "Default browser item title format")
let defaultBrowserTitle = String(format: defaultBrowserFormat, defaultBrowser.name!)
let defaultBrowserTitle = String(format: defaultBrowserFormat, defaultBrowser.name ?? "")
let item = NSMenuItem(title: defaultBrowserTitle, action: nil, keyEquivalent: "")
let icon = defaultBrowser.icon!
let icon = defaultBrowser.icon ?? NSWorkspace.shared.icon(for: UTType.applicationBundle)
icon.size = NSSize(width: 16.0, height: 16.0)
item.image = icon

Expand All @@ -163,7 +163,12 @@ private extension GeneralPreferencesViewController {
menu.addItem(item)
}

defaultBrowserPopup.selectItem(at: defaultBrowserPopup.indexOfItem(withRepresentedObject: AppDefaults.shared.defaultBrowserID))
if let savedID = AppDefaults.shared.defaultBrowserID {
let index = defaultBrowserPopup.indexOfItem(withRepresentedObject: savedID)
defaultBrowserPopup.selectItem(at: index == -1 ? 0 : index)
} else {
defaultBrowserPopup.selectItem(at: 0)
}
}

func updateNotificationSettings() {
Expand Down
2 changes: 1 addition & 1 deletion Modules/RSWeb/Sources/RSWeb/MacWebBrowser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import UniformTypeIdentifiers

/// The filesystem URL of the default web browser.
private class var defaultBrowserURL: URL? {
return NSWorkspace.shared.urlForApplication(toOpen: URL(string: "https:///")!)
return NSWorkspace.shared.urlForApplication(toOpen: URL(string: "https://apple.com/")!)
}

/// The user's default web browser.
Expand Down