diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 3415c38a5..75eb19c5d 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -137,7 +137,7 @@ var appDelegate: AppDelegate! func showAddFeedSheetOnWindow(_ window: NSWindow, urlString: String?, name: String?, account: Account?, folder: Folder?) { addFeedController = AddFeedController(hostWindow: window) - addFeedController?.showAddFeedSheet(.feed, urlString, name, account, folder) + addFeedController?.showAddFeedSheet(urlString, name, account, folder) } // MARK: - NSApplicationDelegate diff --git a/Mac/MainWindow/AddFeed/AddFeedController.swift b/Mac/MainWindow/AddFeed/AddFeedController.swift index 09cc59aff..1f9488a24 100644 --- a/Mac/MainWindow/AddFeed/AddFeedController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedController.swift @@ -33,20 +33,12 @@ import RSParser self.hostWindow = hostWindow } - func showAddFeedSheet(_ type: AddFeedWindowControllerType, _ urlString: String? = nil, _ name: String? = nil, _ account: Account? = nil, _ folder: Folder? = nil) { + func showAddFeedSheet(_ urlString: String? = nil, _ name: String? = nil, _ account: Account? = nil, _ folder: Folder? = nil) { let folderTreeControllerDelegate = FolderTreeControllerDelegate() let folderTreeController = TreeController(delegate: folderTreeControllerDelegate) - switch type { - case .feed: - addFeedWindowController = AddFeedWindowController(urlString: urlString ?? urlStringFromPasteboard, - name: name, - account: account, - folder: folder, - folderTreeController: folderTreeController, - delegate: self) - } - + addFeedWindowController = AddFeedWindowController(urlString: urlString ?? urlStringFromPasteboard, name: name, account: account, folder: folder, folderTreeController: folderTreeController, delegate: self) + addFeedWindowController!.runSheetOnWindow(hostWindow) } diff --git a/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift b/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift index 861489aea..87054e957 100644 --- a/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedWIndowController.swift @@ -9,10 +9,6 @@ import Foundation import Account -enum AddFeedWindowControllerType { - case feed -} - @MainActor protocol AddFeedWindowControllerDelegate: AnyObject { // userEnteredURL will have already been validated and normalized.