diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift index bd54f041f..f9f4b406b 100644 --- a/Frameworks/Account/AccountManager.swift +++ b/Frameworks/Account/AccountManager.swift @@ -18,7 +18,7 @@ private let localAccountIdentifier = "OnMyMac" public final class AccountManager: UnreadCountProvider { public static let shared = AccountManager() - public let localAccount: Account + public let defaultAccount: Account private let accountsFolder = RSDataSubfolder(nil, "Accounts")! private var accountsDictionary = [String: Account]() @@ -74,8 +74,8 @@ public final class AccountManager: UnreadCountProvider { abort() } - localAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: localAccountIdentifier)! - accountsDictionary[localAccount.accountID] = localAccount + defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: localAccountIdentifier)! + accountsDictionary[defaultAccount.accountID] = defaultAccount readNonLocalAccountsFromDisk() @@ -179,10 +179,10 @@ public final class AccountManager: UnreadCountProvider { return accounts.sorted { (account1, account2) -> Bool in - if account1 === localAccount { + if account1 === defaultAccount { return true } - if account2 === localAccount { + if account2 === defaultAccount { return false } return (account1.nameForDisplay as NSString).localizedStandardCompare(account2.nameForDisplay) == .orderedAscending diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index a92136dc1..44570bdce 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -117,7 +117,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, if isFirstRun { logDebugMessage("Is first run.") } - let localAccount = AccountManager.shared.localAccount + let localAccount = AccountManager.shared.defaultAccount DefaultFeedsImporter.importIfNeeded(isFirstRun, account: localAccount) let tempDirectory = NSTemporaryDirectory() @@ -376,7 +376,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, if result == NSApplication.ModalResponse.OK, let url = panel.url { DispatchQueue.main.async { do { - try OPMLImporter.parseAndImport(fileURL: url, account: AccountManager.shared.localAccount) + try OPMLImporter.parseAndImport(fileURL: url, account: AccountManager.shared.defaultAccount) } catch let error as NSError { NSApplication.shared.presentError(error) @@ -401,7 +401,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, if result == NSApplication.ModalResponse.OK, let url = panel.url { DispatchQueue.main.async { let filename = url.lastPathComponent - let opmlString = OPMLExporter.OPMLString(with: AccountManager.shared.localAccount, title: filename) + let opmlString = OPMLExporter.OPMLString(with: AccountManager.shared.defaultAccount, title: filename) do { try opmlString.write(to: url, atomically: true, encoding: String.Encoding.utf8) } @@ -506,7 +506,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, extension AppDelegate { @IBAction func debugSearch(_ sender: Any?) { - AccountManager.shared.localAccount.debugRunSearch() + AccountManager.shared.defaultAccount.debugRunSearch() } } diff --git a/Mac/MainWindow/AddFeed/AddFeedController.swift b/Mac/MainWindow/AddFeed/AddFeedController.swift index 5b41430ba..98c8cff88 100644 --- a/Mac/MainWindow/AddFeed/AddFeedController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedController.swift @@ -44,7 +44,7 @@ class AddFeedController: AddFeedWindowControllerDelegate, FeedFinderDelegate { let folderTreeControllerDelegate = FolderTreeControllerDelegate() - let rootNode = Node(representedObject: AccountManager.shared.localAccount, parent: nil) + let rootNode = Node(representedObject: AccountManager.shared.defaultAccount, parent: nil) rootNode.canHaveChildNodes = true let folderTreeController = TreeController(delegate: folderTreeControllerDelegate, rootNode: rootNode) diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift index d2bd4849e..7201d2061 100644 --- a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -281,7 +281,7 @@ private extension SidebarOutlineDataSource { return node } guard let parentNode = node.parent else { - if let onMyMacAccountNode = treeController.nodeInTreeRepresentingObject(AccountManager.shared.localAccount) { + if let onMyMacAccountNode = treeController.nodeInTreeRepresentingObject(AccountManager.shared.defaultAccount) { return onMyMacAccountNode } return nil diff --git a/Mac/Scriptability/NSScriptCommand+NetNewsWire.swift b/Mac/Scriptability/NSScriptCommand+NetNewsWire.swift index ea448c1ab..6d7db56d3 100644 --- a/Mac/Scriptability/NSScriptCommand+NetNewsWire.swift +++ b/Mac/Scriptability/NSScriptCommand+NetNewsWire.swift @@ -28,7 +28,7 @@ extension NSScriptCommand { func accountAndFolderForNewChild() -> (Account, Folder?) { let appleEvent = self.appleEvent - var account = AccountManager.shared.localAccount + var account = AccountManager.shared.defaultAccount var folder:Folder? = nil if let appleEvent = appleEvent { var descriptorToConsider:NSAppleEventDescriptor? diff --git a/Shared/Importers/DefaultFeedsImporter.swift b/Shared/Importers/DefaultFeedsImporter.swift index cb31a2c30..8621de096 100644 --- a/Shared/Importers/DefaultFeedsImporter.swift +++ b/Shared/Importers/DefaultFeedsImporter.swift @@ -19,7 +19,7 @@ struct DefaultFeedsImporter { appDelegate.logDebugMessage("Importing default feeds.") let defaultFeedsURL = Bundle.main.url(forResource: "DefaultFeeds", withExtension: "opml")! - try! OPMLImporter.parseAndImport(fileURL: defaultFeedsURL, account: AccountManager.shared.localAccount) + try! OPMLImporter.parseAndImport(fileURL: defaultFeedsURL, account: AccountManager.shared.defaultAccount) } private static func shouldImportDefaultFeeds(_ isFirstRun: Bool) -> Bool { diff --git a/Shared/Tree/FolderTreeControllerDelegate.swift b/Shared/Tree/FolderTreeControllerDelegate.swift index 23a81abde..bb90b1859 100644 --- a/Shared/Tree/FolderTreeControllerDelegate.swift +++ b/Shared/Tree/FolderTreeControllerDelegate.swift @@ -27,7 +27,7 @@ private extension FolderTreeControllerDelegate { // Root node is “Top Level” and children are folders. Folders can’t have subfolders. // This will have to be revised later. - guard let folders = AccountManager.shared.localAccount.folders else { + guard let folders = AccountManager.shared.defaultAccount.folders else { return nil } let folderNodes = folders.map { createNode($0, parent: node) } diff --git a/iOS/Add/AddFeedFolderPickerData.swift b/iOS/Add/AddFeedFolderPickerData.swift index 70d3d0293..bd6ea0811 100644 --- a/iOS/Add/AddFeedFolderPickerData.swift +++ b/iOS/Add/AddFeedFolderPickerData.swift @@ -21,7 +21,7 @@ struct AddFeedFolderPickerData { let treeControllerDelegate = FolderTreeControllerDelegate() - let rootNode = Node(representedObject: AccountManager.shared.localAccount, parent: nil) + let rootNode = Node(representedObject: AccountManager.shared.defaultAccount, parent: nil) rootNode.canHaveChildNodes = true let treeController = TreeController(delegate: treeControllerDelegate, rootNode: rootNode) diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 6f09fd21c..76c77612b 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -65,7 +65,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele os_log("Is first run.", log: log, type: .info) } - let localAccount = AccountManager.shared.localAccount + let localAccount = AccountManager.shared.defaultAccount DefaultFeedsImporter.importIfNeeded(isFirstRun, account: localAccount) let tempDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index c6f396dc4..56fcb87e4 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -127,7 +127,7 @@ extension SettingsViewController: UIDocumentPickerDelegate { for url in urls { do { - try OPMLImporter.parseAndImport(fileURL: url, account: AccountManager.shared.localAccount) + try OPMLImporter.parseAndImport(fileURL: url, account: AccountManager.shared.defaultAccount) } catch { presentError(title: "OPML Import Error", message: error.localizedDescription) } @@ -174,7 +174,7 @@ private extension SettingsViewController { let filename = "MySubscriptions.opml" let tempFile = FileManager.default.temporaryDirectory.appendingPathComponent(filename) - let opmlString = OPMLExporter.OPMLString(with: AccountManager.shared.localAccount, title: filename) + let opmlString = OPMLExporter.OPMLString(with: AccountManager.shared.defaultAccount, title: filename) do { try opmlString.write(to: tempFile, atomically: true, encoding: String.Encoding.utf8) } catch {