FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert some functions to async instead of completion-based.

Browse Source
This commit is contained in:
Brent Simmons 2024-05-05 18:02:46 -07:00
parent cd7f4f7052
commit 3d91a6b38d
6 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mac/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@ -54,8 +54,7 @@ class AddFeedWindowController : NSWindowController {
} }
func runSheetOnWindow(_ hostWindow: NSWindow) { func runSheetOnWindow(_ hostWindow: NSWindow) {
hostWindow.beginSheet(window!) { (returnCode: NSApplication.ModalResponse) -> Void in hostWindow.beginSheet(window!, completionHandler: nil)
}
} }
override func windowDidLoad() { override func windowDidLoad() {

10
Mac/Preferences/Accounts/AccountsDetailViewController.swift
View File

@ -64,14 +64,16 @@ final class AccountsDetailViewController: NSViewController, NSTextFieldDelegate
@IBAction func credentials(_ sender: Any) { @IBAction func credentials(_ sender: Any) {
guard let account = account else { return } guard let account else { return }
switch account.type { switch account.type {
case .feedbin: case .feedbin:
let accountsFeedbinWindowController = AccountsFeedbinWindowController() let accountsFeedbinWindowController = AccountsFeedbinWindowController()
accountsFeedbinWindowController.account = account accountsFeedbinWindowController.account = account
accountsFeedbinWindowController.runSheetOnWindow(self.view.window!) accountsFeedbinWindowController.runSheetOnWindow(self.view.window!)
accountsWindowController = accountsFeedbinWindowController accountsWindowController = accountsFeedbinWindowController
case .inoreader, .bazQux, .theOldReader, .freshRSS: case .inoreader, .bazQux, .theOldReader, .freshRSS:
let accountsReaderAPIWindowController = AccountsReaderAPIWindowController() let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
accountsReaderAPIWindowController.accountType = account.type accountsReaderAPIWindowController.accountType = account.type
@ -79,15 +81,15 @@ final class AccountsDetailViewController: NSViewController, NSTextFieldDelegate
accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!) accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
accountsWindowController = accountsReaderAPIWindowController accountsWindowController = accountsReaderAPIWindowController
break break
case .newsBlur: case .newsBlur:
let accountsNewsBlurWindowController = AccountsNewsBlurWindowController() let accountsNewsBlurWindowController = AccountsNewsBlurWindowController()
accountsNewsBlurWindowController.account = account accountsNewsBlurWindowController.account = account
accountsNewsBlurWindowController.runSheetOnWindow(self.view.window!) accountsNewsBlurWindowController.runSheetOnWindow(self.view.window!)
accountsWindowController = accountsNewsBlurWindowController accountsWindowController = accountsNewsBlurWindowController
default: default:
break break
} }
} }
} }

8
Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift
View File

@ -11,7 +11,7 @@ import Account
import Web import Web
import Secrets import Secrets
class AccountsFeedbinWindowController: NSWindowController { final class AccountsFeedbinWindowController: NSWindowController {
@IBOutlet weak var signInTextField: NSTextField! @IBOutlet weak var signInTextField: NSTextField!
@IBOutlet weak var noAccountTextField: NSTextField! @IBOutlet weak var noAccountTextField: NSTextField!
@ -49,9 +49,11 @@ class AccountsFeedbinWindowController: NSWindowController {
// MARK: API // MARK: API
func runSheetOnWindow(_ hostWindow: NSWindow, completion: ((NSApplication.ModalResponse) -> Void)? = nil) { func runSheetOnWindow(_ hostWindow: NSWindow) {
self.hostWindow = hostWindow self.hostWindow = hostWindow
hostWindow.beginSheet(window!, completionHandler: completion) Task { @MainActor in
await hostWindow.beginSheet(window!)
}
} }
// MARK: Actions // MARK: Actions

6
Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift
View File

@ -47,9 +47,11 @@ class AccountsNewsBlurWindowController: NSWindowController {
// MARK: API // MARK: API
func runSheetOnWindow(_ hostWindow: NSWindow, completion: ((NSApplication.ModalResponse) -> Void)? = nil) { func runSheetOnWindow(_ hostWindow: NSWindow) {
self.hostWindow = hostWindow self.hostWindow = hostWindow
hostWindow.beginSheet(window!, completionHandler: completion) Task { @MainActor in
await hostWindow.beginSheet(window!)
}
} }
// MARK: Actions // MARK: Actions

12
Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
View File

@ -151,12 +151,16 @@ extension AccountsPreferencesViewController: NSTableViewDelegate {
} }
extension AccountsPreferencesViewController: AccountsPreferencesAddAccountDelegate { extension AccountsPreferencesViewController: AccountsPreferencesAddAccountDelegate {
func presentSheetForAccount(_ accountType: AccountType) { func presentSheetForAccount(_ accountType: AccountType) {
switch accountType { switch accountType {
case .onMyMac: case .onMyMac:
let accountsAddLocalWindowController = AccountsAddLocalWindowController() let accountsAddLocalWindowController = AccountsAddLocalWindowController()
accountsAddLocalWindowController.runSheetOnWindow(self.view.window!) accountsAddLocalWindowController.runSheetOnWindow(self.view.window!)
addAccountWindowController = accountsAddLocalWindowController addAccountWindowController = accountsAddLocalWindowController
case .cloudKit: case .cloudKit:
let accountsAddCloudKitWindowController = AccountsAddCloudKitWindowController() let accountsAddCloudKitWindowController = AccountsAddCloudKitWindowController()
@ -166,30 +170,34 @@ extension AccountsPreferencesViewController: AccountsPreferencesAddAccountDelega
self.tableView.reloadData() self.tableView.reloadData()
} }
} }
addAccountWindowController = accountsAddCloudKitWindowController addAccountWindowController = accountsAddCloudKitWindowController
case .feedbin: case .feedbin:
let accountsFeedbinWindowController = AccountsFeedbinWindowController() let accountsFeedbinWindowController = AccountsFeedbinWindowController()
accountsFeedbinWindowController.runSheetOnWindow(self.view.window!) accountsFeedbinWindowController.runSheetOnWindow(self.view.window!)
addAccountWindowController = accountsFeedbinWindowController addAccountWindowController = accountsFeedbinWindowController
case .freshRSS, .inoreader, .bazQux, .theOldReader: case .freshRSS, .inoreader, .bazQux, .theOldReader:
let accountsReaderAPIWindowController = AccountsReaderAPIWindowController() let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
accountsReaderAPIWindowController.accountType = accountType accountsReaderAPIWindowController.accountType = accountType
accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!) accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
addAccountWindowController = accountsReaderAPIWindowController addAccountWindowController = accountsReaderAPIWindowController
case .feedly: case .feedly:
let addAccount = FeedlyOAuthAccountAuthorizationOperation(accountType: .feedly, secretsProvider: Secrets()) let addAccount = FeedlyOAuthAccountAuthorizationOperation(accountType: .feedly, secretsProvider: Secrets())
addAccount.delegate = self addAccount.delegate = self
addAccount.presentationAnchor = self.view.window! addAccount.presentationAnchor = self.view.window!
runAwaitingFeedlyLoginAlertModal(forLifetimeOf: addAccount) runAwaitingFeedlyLoginAlertModal(forLifetimeOf: addAccount)
MainThreadOperationQueue.shared.add(addAccount) MainThreadOperationQueue.shared.add(addAccount)
case .newsBlur: case .newsBlur:
let accountsNewsBlurWindowController = AccountsNewsBlurWindowController() let accountsNewsBlurWindowController = AccountsNewsBlurWindowController()
accountsNewsBlurWindowController.runSheetOnWindow(self.view.window!) accountsNewsBlurWindowController.runSheetOnWindow(self.view.window!)
addAccountWindowController = accountsNewsBlurWindowController addAccountWindowController = accountsNewsBlurWindowController
} }
} }
private func runAwaitingFeedlyLoginAlertModal(forLifetimeOf operation: FeedlyOAuthAccountAuthorizationOperation) { private func runAwaitingFeedlyLoginAlertModal(forLifetimeOf operation: FeedlyOAuthAccountAuthorizationOperation) {
let alert = NSAlert() let alert = NSAlert()
alert.alertStyle = .informational alert.alertStyle = .informational

6
Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift
View File

@ -79,9 +79,11 @@ class AccountsReaderAPIWindowController: NSWindowController {
// MARK: API // MARK: API
func runSheetOnWindow(_ hostWindow: NSWindow, completion: ((NSApplication.ModalResponse) -> Void)? = nil) { func runSheetOnWindow(_ hostWindow: NSWindow) {
self.hostWindow = hostWindow self.hostWindow = hostWindow
hostWindow.beginSheet(window!, completionHandler: completion) Task { @MainActor in
await hostWindow.beginSheet(window!)
}
} }
// MARK: Actions // MARK: Actions