From 226724c2d78167aa6ce561d9dc2c21a60d5a7cb3 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Thu, 2 Jan 2025 22:23:06 -0800 Subject: [PATCH] Reconcile with 6.1.6-ios branch. --- iOS/Add/AddFeedFolderViewController.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/iOS/Add/AddFeedFolderViewController.swift b/iOS/Add/AddFeedFolderViewController.swift index 42b560fe3..5c75bbb94 100644 --- a/iOS/Add/AddFeedFolderViewController.swift +++ b/iOS/Add/AddFeedFolderViewController.swift @@ -17,7 +17,6 @@ protocol AddFeedFolderViewControllerDelegate { class AddFeedFolderViewController: UITableViewController { var delegate: AddFeedFolderViewControllerDelegate? - var addFeedType = AddFeedType.web var initialContainer: Container? var containers = [Container]() @@ -25,13 +24,8 @@ class AddFeedFolderViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - var sortedActiveAccounts: [Account] - if addFeedType == .web { - sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts - } else { - sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts.filter { $0.type == .onMyMac || $0.type == .cloudKit } - } - + let sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts + for account in sortedActiveAccounts { containers.append(account) if let sortedFolders = account.sortedFolders {