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

Clean activities when the associated data is deleted

Browse Source
This commit is contained in:
Maurice Parker
2019-08-28 11:30:40 -05:00
parent ba9f7ac426
commit 9c66f6160e
4 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -859,6 +859,12 @@ private extension MasterFeedViewController {
return
}
if let folder = deleteNode.representedObject as? Folder {
ActivityManager.shared.cleanUp(folder)
} else if let feed = deleteNode.representedObject as? Feed {
ActivityManager.shared.cleanUp(feed)
}
var deleteIndexPaths = [indexPath]
if coordinator.isExpanded(deleteNode) {
for i in 0..<deleteNode.numberOfChildNodes {

1
iOS/Settings/SettingsDetailAccountView.swift
View File

@@ -114,6 +114,7 @@ struct SettingsDetailAccountView : View {
func delete() {
AccountManager.shared.deleteAccount(account)
ActivityManager.shared.cleanUp(account)
}
}
}

1
iOS/Settings/UIKit/DetailAccountViewController.swift
View File

@@ -121,6 +121,7 @@ private extension DetailAccountViewController {
let markAction = UIAlertAction(title: markTitle, style: .default) { [weak self] (action) in
guard let account = self?.account else { return }
AccountManager.shared.deleteAccount(account)
ActivityManager.shared.cleanUp(account)
self?.navigationController?.popViewController(animated: true)
}
alertController.addAction(markAction)