renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change to not suggest root folder for Accounts that don't support it. Issue #1287

Browse Source
This commit is contained in:
Maurice Parker
2019-11-16 13:25:55 -06:00
parent 91a3e4fd73
commit 5ce5175bc0
6 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/Add/AddWebFeedViewController.swift
View File

@@ -48,10 +48,8 @@ class AddWebFeedViewController: UITableViewController, AddContainerViewControlle
nameTextField.text = initialFeedName
nameTextField.delegate = self
if let accountID = AppDefaults.addWebFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
container = account
} else if let account = AccountManager.shared.sortedActiveAccounts.first {
container = account
if let defaultContainer = AddWebFeedDefaultContainer.defaultContainer {
container = defaultContainer
} else {
delegate?.readyToAdd(state: false)
}
@@ -138,7 +136,7 @@ extension AddWebFeedViewController: AddWebFeedFolderViewControllerDelegate {
func didSelect(container: Container) {
self.container = container
updateFolderLabel()
AppDefaults.addWebFeedAccountID = container.account?.accountID
AddWebFeedDefaultContainer.storeDefaultContainer(container)
}
}