FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix feed deletion in folder triggering unexpected deletes

This commit is contained in:
Anh Do 2020-03-21 21:25:39 -04:00
parent a9615560ae
commit fe7cbe3bd3
No known key found for this signature in database
GPG Key ID: 451E3092F917B62D
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift
View File

@ -479,13 +479,22 @@ extension NewsBlurAccountDelegate {
switch result { switch result {
case .success: case .success:
DispatchQueue.main.async { DispatchQueue.main.async {
account.clearWebFeedMetadata(feed) let feedID = feed.webFeedID
account.removeWebFeed(feed)
if folderName == nil {
account.removeWebFeed(feed)
}
if let folders = account.folders { if let folders = account.folders {
for folder in folders where folderName != nil && folder.name == folderName { for folder in folders where folderName != nil && folder.name == folderName {
folder.removeWebFeed(feed) folder.removeWebFeed(feed)
} }
} }
if account.flattenedWebFeeds().first(where: { $0.webFeedID == feedID }) == nil {
account.clearWebFeedMetadata(feed)
}
completion(.success(())) completion(.success(()))
} }