From 5d5f31f045d91b6141c294c1dc381d13b130f7a6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 27 Oct 2024 12:00:20 -0700 Subject: [PATCH] Use accountType.createAccountURL property. --- .../AccountsReaderAPIWindowController.swift | 14 ++++---------- .../ReaderAPIAccountViewController.swift | 18 +++++------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index c3690a9e5..3e5ba59d6 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -194,18 +194,12 @@ class AccountsReaderAPIWindowController: NSWindowController { } @IBAction func createAccountWithProvider(_ sender: Any) { - switch accountType { - case .freshRSS: - NSWorkspace.shared.open(URL(string: "https://freshrss.org")!) - case .inoreader: - NSWorkspace.shared.open(URL(string: "https://www.inoreader.com")!) - case .bazQux: - NSWorkspace.shared.open(URL(string: "https://bazqux.com")!) - case .theOldReader: - NSWorkspace.shared.open(URL(string: "https://theoldreader.com")!) - default: + + guard let createAccountURL = accountType.createAccountURL else { return } + + NSWorkspace.shared.open(createAccountURL) } // MARK: Autofill diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index 24cefe5bc..1fab1cd88 100644 --- a/iOS/Account/ReaderAPIAccountViewController.swift +++ b/iOS/Account/ReaderAPIAccountViewController.swift @@ -265,20 +265,12 @@ class ReaderAPIAccountViewController: UITableViewController { } @IBAction func signUpWithProvider(_ sender: Any) { - var url: URL! - switch accountType { - case .bazQux: - url = URL(string: "https://bazqux.com")! - case .inoreader: - url = URL(string: "https://www.inoreader.com")! - case .theOldReader: - url = URL(string: "https://theoldreader.com")! - case .freshRSS: - url = URL(string: "https://freshrss.org")! - default: - return + + guard let createAccountURL = accountType.createAccountURL else { + return } - let safari = SFSafariViewController(url: url) + + let safari = SFSafariViewController(url: createAccountURL) safari.modalPresentationStyle = .currentContext self.present(safari, animated: true, completion: nil) }