FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update iOS to work with latest from the Accounts framework

Browse Source
This commit is contained in:
Maurice Parker 2019-05-09 17:30:36 -05:00
parent 23b43ecc07
commit 2401c96c99
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
iOS/Add/AddFeedViewController.swift
View File

@ -90,7 +90,7 @@ class AddFeedViewController: UITableViewController, AddContainerViewControllerCh
delegate?.processingDidBegin() delegate?.processingDidBegin()
account!.createFeed(with: nil, url: url.absoluteString) { [weak self] result in account!.createFeed(url: url.absoluteString) { [weak self] result in
switch result { switch result {
case .success(let createFeedResult): case .success(let createFeedResult):
@ -176,13 +176,29 @@ private extension AddFeedViewController {
} }
} }
// TODO: make this async and add to above code if let folder = folder {
account.addFeed(feed, to: folder) folder.addFeed(feed) { [weak self] result in
switch result {
// Move this into the mess above case .success:
self?.delegate?.processingDidEnd()
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed]) NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
case .failure(let error):
delegate?.processingDidEnd() self?.delegate?.processingDidEnd()
self?.presentError(error)
}
}
} else {
account.addFeed(feed) { [weak self] result in
switch result {
case .success:
self?.delegate?.processingDidEnd()
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
case .failure(let error):
self?.delegate?.processingDidEnd()
self?.presentError(error)
}
}
}
} }

16
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -362,10 +362,12 @@ class MasterFeedViewController: ProgressTableViewController, UndoableCommandRunn
}() }()
// Move the Feed // Move the Feed
let account = accountForNode(destNode) let source = sourceNode.parent?.representedObject as? Container
let sourceContainer = sourceNode.parent?.representedObject as? Container let destination = destParentNode?.representedObject as? Container
let destinationFolder = destParentNode?.representedObject as? Folder source?.removeFeed(feed) { [weak self] result in
sourceContainer?.deleteFeed(feed) { [weak self] result in switch result {
case .success:
destination?.addFeed(feed) { result in
switch result { switch result {
case .success: case .success:
break break
@ -373,8 +375,10 @@ class MasterFeedViewController: ProgressTableViewController, UndoableCommandRunn
self?.presentError(error) self?.presentError(error)
} }
} }
account?.addFeed(feed, to: destinationFolder) case .failure(let error):
account?.structureDidChange() self?.presentError(error)
}
}
} }