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

Rename AccountManageer.localAccount to AccountManager.defaultAccount to make it different from other local accounts

Browse Source
This commit is contained in:
Maurice Parker
2019-05-01 05:53:18 -05:00
parent a682a78820
commit 4bc7611721
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Add/AddFeedFolderPickerData.swift
View File

@@ -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)

2
iOS/AppDelegate.swift
View File

@@ -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!

4
iOS/Settings/SettingsViewController.swift
View File

@@ -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 {