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

Fix delete folder bug

Browse Source
This commit is contained in:
Maurice Parker 2019-05-09 13:35:40 -05:00
parent cda8acc66c
commit d4bfab2da6
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -209,8 +209,8 @@ final class FeedbinAccountDelegate: AccountDelegate {
caller.createTagging(feedID: feedID, name: folder.name ?? "") { [weak self] result in caller.createTagging(feedID: feedID, name: folder.name ?? "") { [weak self] result in
switch result { switch result {
case .success(let taggingID): case .success(let taggingID):
self?.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: String(taggingID))
DispatchQueue.main.async { DispatchQueue.main.async {
self?.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: String(taggingID))
folder.addFeed(feed) folder.addFeed(feed)
completion(.success(())) completion(.success(()))
} }
@ -491,8 +491,8 @@ private extension FeedbinAccountDelegate {
guard let feed = account.idToFeedDictionary[taggingFeedID] else { guard let feed = account.idToFeedDictionary[taggingFeedID] else {
continue continue
} }
saveFolderRelationship(for: feed, withFolderName: folderName, id: String(tagging.taggingID))
DispatchQueue.main.sync { DispatchQueue.main.sync {
saveFolderRelationship(for: feed, withFolderName: folderName, id: String(tagging.taggingID))
folder.addFeed(feed) folder.addFeed(feed)
} }
} }
@ -535,16 +535,13 @@ private extension FeedbinAccountDelegate {
} }
func clearFolderRelationship(for feed: Feed, withFolderName folderName: String) { func clearFolderRelationship(for feed: Feed, withFolderName folderName: String) {
DispatchQueue.main.sync {
if var folderRelationship = feed.folderRelationship { if var folderRelationship = feed.folderRelationship {
folderRelationship[folderName] = nil folderRelationship[folderName] = nil
feed.folderRelationship = folderRelationship feed.folderRelationship = folderRelationship
} }
} }
}
func saveFolderRelationship(for feed: Feed, withFolderName folderName: String, id: String) { func saveFolderRelationship(for feed: Feed, withFolderName folderName: String, id: String) {
DispatchQueue.main.sync {
if var folderRelationship = feed.folderRelationship { if var folderRelationship = feed.folderRelationship {
folderRelationship[folderName] = id folderRelationship[folderName] = id
feed.folderRelationship = folderRelationship feed.folderRelationship = folderRelationship
@ -552,6 +549,5 @@ private extension FeedbinAccountDelegate {
feed.folderRelationship = [folderName: id] feed.folderRelationship = [folderName: id]
} }
} }
}
} }