diff --git a/Mac/AppDefaults.swift b/Mac/AppDefaults.swift index f01400420..3848f9fbf 100644 --- a/Mac/AppDefaults.swift +++ b/Mac/AppDefaults.swift @@ -35,7 +35,7 @@ final class AppDefaults { static let articleTextSize = "articleTextSize" static let refreshInterval = "refreshInterval" static let addFeedAccountID = "addWebFeedAccountID" - static let addWebFeedFolderName = "addWebFeedFolderName" + static let addFeedFolderName = "addWebFeedFolderName" static let addFolderAccountID = "addFolderAccountID" static let importOPMLAccountID = "importOPMLAccountID" static let exportOPMLAccountID = "exportOPMLAccountID" @@ -161,12 +161,12 @@ final class AppDefaults { } } - var addWebFeedFolderName: String? { + var addFeedFolderName: String? { get { - return AppDefaults.string(for: Key.addWebFeedFolderName) + return AppDefaults.string(for: Key.addFeedFolderName) } set { - AppDefaults.setString(for: Key.addWebFeedFolderName, newValue) + AppDefaults.setString(for: Key.addFeedFolderName, newValue) } } diff --git a/Shared/Extensions/AddWebFeedDefaultContainer.swift b/Shared/Extensions/AddWebFeedDefaultContainer.swift index eb3c0283f..2aa74112f 100644 --- a/Shared/Extensions/AddWebFeedDefaultContainer.swift +++ b/Shared/Extensions/AddWebFeedDefaultContainer.swift @@ -14,7 +14,7 @@ struct AddWebFeedDefaultContainer { static var defaultContainer: Container? { if let accountID = AppDefaults.shared.addFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) { - if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) { + if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.existingFolder(withDisplayName: folderName) { return folder } else { return substituteContainerIfNeeded(account: account) @@ -30,9 +30,9 @@ struct AddWebFeedDefaultContainer { static func saveDefaultContainer(_ container: Container) { AppDefaults.shared.addFeedAccountID = container.account?.accountID if let folder = container as? Folder { - AppDefaults.shared.addWebFeedFolderName = folder.nameForDisplay + AppDefaults.shared.addFeedFolderName = folder.nameForDisplay } else { - AppDefaults.shared.addWebFeedFolderName = nil + AppDefaults.shared.addFeedFolderName = nil } } diff --git a/Shared/ShareExtension/ShareDefaultContainer.swift b/Shared/ShareExtension/ShareDefaultContainer.swift index 25d674404..5cc5ef24e 100644 --- a/Shared/ShareExtension/ShareDefaultContainer.swift +++ b/Shared/ShareExtension/ShareDefaultContainer.swift @@ -13,7 +13,7 @@ struct ShareDefaultContainer { static func defaultContainer(containers: ExtensionContainers) -> ExtensionContainer? { if let accountID = AppDefaults.shared.addFeedAccountID, let account = containers.accounts.first(where: { $0.accountID == accountID }) { - if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) { + if let folderName = AppDefaults.shared.addFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) { return folder } else { return substituteContainerIfNeeded(account: account) @@ -29,9 +29,9 @@ struct ShareDefaultContainer { static func saveDefaultContainer(_ container: ExtensionContainer) { AppDefaults.shared.addFeedAccountID = container.accountID if let folder = container as? ExtensionFolder { - AppDefaults.shared.addWebFeedFolderName = folder.name + AppDefaults.shared.addFeedFolderName = folder.name } else { - AppDefaults.shared.addWebFeedFolderName = nil + AppDefaults.shared.addFeedFolderName = nil } } diff --git a/iOS/AppDefaults.swift b/iOS/AppDefaults.swift index 458daa7de..f2769d598 100644 --- a/iOS/AppDefaults.swift +++ b/iOS/AppDefaults.swift @@ -55,7 +55,7 @@ final class AppDefaults: ObservableObject { static let hasUsedFullScreenPreviously = "hasUsedFullScreenPreviously" static let confirmMarkAllAsRead = "confirmMarkAllAsRead" static let addFeedAccountID = "addWebFeedAccountID" - static let addWebFeedFolderName = "addWebFeedFolderName" + static let addFeedFolderName = "addWebFeedFolderName" static let addFolderAccountID = "addFolderAccountID" static let useSystemBrowser = "useSystemBrowser" static let currentThemeName = "currentThemeName" @@ -102,12 +102,12 @@ final class AppDefaults: ObservableObject { } } - var addWebFeedFolderName: String? { + var addFeedFolderName: String? { get { - return AppDefaults.string(for: Key.addWebFeedFolderName) + return AppDefaults.string(for: Key.addFeedFolderName) } set { - AppDefaults.setString(for: Key.addWebFeedFolderName, newValue) + AppDefaults.setString(for: Key.addFeedFolderName, newValue) AppDefaults.shared.objectWillChange.send() } }