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 {
|
class AddFeedFolderViewController: UITableViewController {
|
||||||
|
|
||||||
var delegate: AddFeedFolderViewControllerDelegate?
|
var delegate: AddFeedFolderViewControllerDelegate?
|
||||||
var addFeedType = AddFeedType.web
|
|
||||||
var initialContainer: Container?
|
var initialContainer: Container?
|
||||||
|
|
||||||
var containers = [Container]()
|
var containers = [Container]()
|
||||||
@ -25,12 +24,7 @@ class AddFeedFolderViewController: UITableViewController {
|
|||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
|
|
||||||
var sortedActiveAccounts: [Account]
|
let sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts
|
||||||
if addFeedType == .web {
|
|
||||||
sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts
|
|
||||||
} else {
|
|
||||||
sortedActiveAccounts = AccountManager.shared.sortedActiveAccounts.filter { $0.type == .onMyMac || $0.type == .cloudKit }
|
|
||||||
}
|
|
||||||
|
|
||||||
for account in sortedActiveAccounts {
|
for account in sortedActiveAccounts {
|
||||||
containers.append(account)
|
containers.append(account)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user