diff --git a/iOS/Add/AddFeedFolderViewController.swift b/iOS/Add/AddFeedFolderViewController.swift index 367a85753..42b560fe3 100644 --- a/iOS/Add/AddFeedFolderViewController.swift +++ b/iOS/Add/AddFeedFolderViewController.swift @@ -17,6 +17,7 @@ protocol AddFeedFolderViewControllerDelegate { class AddFeedFolderViewController: UITableViewController { var delegate: AddFeedFolderViewControllerDelegate? + var addFeedType = AddFeedType.web var initialContainer: Container? var containers = [Container]() @@ -24,7 +25,14 @@ class AddFeedFolderViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - for account in AccountManager.shared.sortedActiveAccounts { + var sortedActiveAccounts: [Account] + if addFeedType == .web { + sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts + } else { + sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts.filter { $0.type == .onMyMac || $0.type == .cloudKit } + } + + for account in sortedActiveAccounts { containers.append(account) if let sortedFolders = account.sortedFolders { containers.append(contentsOf: sortedFolders) diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index e5e6e4e8e..ed5f9cf9c 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -164,6 +164,7 @@ class AddFeedViewController: UITableViewController { navController.modalPresentationStyle = .currentContext let folderViewController = navController.topViewController as! AddFeedFolderViewController folderViewController.delegate = self + folderViewController.addFeedType = addFeedType folderViewController.initialContainer = container present(navController, animated: true) } diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 98c1181d8..897755b6e 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -421,8 +421,12 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { } alertController.addAction(addWebFeedAction) - alertController.addAction(addRedditFeedAction) - alertController.addAction(addTwitterFeedAction) + + if AccountManager.shared.activeAccounts.contains(where: { $0.type == .onMyMac || $0.type == .cloudKit }) { + alertController.addAction(addRedditFeedAction) + alertController.addAction(addTwitterFeedAction) + } + alertController.addAction(addWebFolderAction) alertController.addAction(cancelAction)