Reconcile with 6.1.6-ios branch.
This commit is contained in:
parent
d4807e6a88
commit
226724c2d7
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user