From 5c2a33a8002191002a8b275d80f633c4da653398 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 2 Jul 2023 15:25:50 -0700
Subject: [PATCH] Rename AppDefaults.addWebFeedAccountID to .addFeedAccountID.

---
 Mac/AppDefaults.swift                              | 8 ++++----
 Shared/Extensions/AddWebFeedDefaultContainer.swift | 4 ++--
 Shared/ShareExtension/ShareDefaultContainer.swift  | 4 ++--
 iOS/AppDefaults.swift                              | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Mac/AppDefaults.swift b/Mac/AppDefaults.swift
index c5a700a64..f01400420 100644
--- a/Mac/AppDefaults.swift
+++ b/Mac/AppDefaults.swift
@@ -34,7 +34,7 @@ final class AppDefaults {
 		static let subscribeToFeedsInDefaultBrowser = "subscribeToFeedsInDefaultBrowser"
 		static let articleTextSize = "articleTextSize"
 		static let refreshInterval = "refreshInterval"
-		static let addWebFeedAccountID = "addWebFeedAccountID"
+		static let addFeedAccountID = "addWebFeedAccountID"
 		static let addWebFeedFolderName = "addWebFeedFolderName"
 		static let addFolderAccountID = "addFolderAccountID"
 		static let importOPMLAccountID = "importOPMLAccountID"
@@ -152,12 +152,12 @@ final class AppDefaults {
 		}
 	}
 
-	var addWebFeedAccountID: String? {
+	var addFeedAccountID: String? {
 		get {
-			return AppDefaults.string(for: Key.addWebFeedAccountID)
+			return AppDefaults.string(for: Key.addFeedAccountID)
 		}
 		set {
-			AppDefaults.setString(for: Key.addWebFeedAccountID, newValue)
+			AppDefaults.setString(for: Key.addFeedAccountID, newValue)
 		}
 	}
 
diff --git a/Shared/Extensions/AddWebFeedDefaultContainer.swift b/Shared/Extensions/AddWebFeedDefaultContainer.swift
index 65cb31a3f..eb3c0283f 100644
--- a/Shared/Extensions/AddWebFeedDefaultContainer.swift
+++ b/Shared/Extensions/AddWebFeedDefaultContainer.swift
@@ -13,7 +13,7 @@ struct AddWebFeedDefaultContainer {
 	
 	static var defaultContainer: Container? {
 		
-		if let accountID = AppDefaults.shared.addWebFeedAccountID, let account = AccountManager.shared.activeAccounts.first(where: { $0.accountID == accountID }) {
+		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) {
 				return folder
 			} else {
@@ -28,7 +28,7 @@ struct AddWebFeedDefaultContainer {
 	}
 	
 	static func saveDefaultContainer(_ container: Container) {
-		AppDefaults.shared.addWebFeedAccountID = container.account?.accountID
+		AppDefaults.shared.addFeedAccountID = container.account?.accountID
 		if let folder = container as? Folder {
 			AppDefaults.shared.addWebFeedFolderName = folder.nameForDisplay
 		} else {
diff --git a/Shared/ShareExtension/ShareDefaultContainer.swift b/Shared/ShareExtension/ShareDefaultContainer.swift
index ecacd8d1e..25d674404 100644
--- a/Shared/ShareExtension/ShareDefaultContainer.swift
+++ b/Shared/ShareExtension/ShareDefaultContainer.swift
@@ -12,7 +12,7 @@ struct ShareDefaultContainer {
 	
 	static func defaultContainer(containers: ExtensionContainers) -> ExtensionContainer? {
 		
-		if let accountID = AppDefaults.shared.addWebFeedAccountID, let account = containers.accounts.first(where: { $0.accountID == accountID }) {
+		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 }) {
 				return folder
 			} else {
@@ -27,7 +27,7 @@ struct ShareDefaultContainer {
 	}
 	
 	static func saveDefaultContainer(_ container: ExtensionContainer) {
-		AppDefaults.shared.addWebFeedAccountID = container.accountID
+		AppDefaults.shared.addFeedAccountID = container.accountID
 		if let folder = container as? ExtensionFolder {
 			AppDefaults.shared.addWebFeedFolderName = folder.name
 		} else {
diff --git a/iOS/AppDefaults.swift b/iOS/AppDefaults.swift
index d10a7e3d0..458daa7de 100644
--- a/iOS/AppDefaults.swift
+++ b/iOS/AppDefaults.swift
@@ -54,7 +54,7 @@ final class AppDefaults: ObservableObject {
 		static let articleFullscreenEnabled = "articleFullscreenEnabled"
 		static let hasUsedFullScreenPreviously = "hasUsedFullScreenPreviously"
 		static let confirmMarkAllAsRead = "confirmMarkAllAsRead"
-		static let addWebFeedAccountID = "addWebFeedAccountID"
+		static let addFeedAccountID = "addWebFeedAccountID"
 		static let addWebFeedFolderName = "addWebFeedFolderName"
 		static let addFolderAccountID = "addFolderAccountID"
 		static let useSystemBrowser = "useSystemBrowser"
@@ -92,12 +92,12 @@ final class AppDefaults: ObservableObject {
 		}
 	}
 
-	var addWebFeedAccountID: String? {
+	var addFeedAccountID: String? {
 		get {
-			return AppDefaults.string(for: Key.addWebFeedAccountID)
+			return AppDefaults.string(for: Key.addFeedAccountID)
 		}
 		set {
-			AppDefaults.setString(for: Key.addWebFeedAccountID, newValue)
+			AppDefaults.setString(for: Key.addFeedAccountID, newValue)
 			AppDefaults.shared.objectWillChange.send()
 		}
 	}