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

Merge pull request #1258 from kielgillard/master 

Fixes an issue where sending article statuses to Feedly…
This commit is contained in:
Maurice Parker 2019-11-05 19:13:46 -06:00 committed by GitHub
parent 560f36621f 1a1ee0fa17
commit c590e2d136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/Feedly/Operations/FeedlyOperation.swift
View File

@ -20,12 +20,14 @@ class FeedlyOperation: Operation {
func didFinish() { func didFinish() {
assert(Thread.isMainThread) assert(Thread.isMainThread)
assert(!isFinished, "Finished operation is attempting to finish again.")
self.isExecutingOperation = false self.isExecutingOperation = false
self.isFinishedOperation = true self.isFinishedOperation = true
} }
func didFinish(_ error: Error) { func didFinish(_ error: Error) {
assert(Thread.isMainThread) assert(Thread.isMainThread)
assert(!isFinished, "Finished operation is attempting to finish again.")
delegate?.feedlyOperation(self, didFailWith: error) delegate?.feedlyOperation(self, didFailWith: error)
didFinish() didFinish()
} }

3
Frameworks/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift
View File

@ -24,9 +24,8 @@ final class FeedlySendArticleStatusesOperation: FeedlyOperation {
} }
override func main() { override func main() {
defer { didFinish() }
guard !isCancelled else { guard !isCancelled else {
didFinish()
return return
} }

3
Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift
View File

@ -27,9 +27,8 @@ final class FeedlySetStarredArticlesOperation: FeedlyOperation {
} }
override func main() { override func main() {
defer { didFinish() }
guard !isCancelled else { guard !isCancelled else {
didFinish()
return return
} }

1
Frameworks/Account/Feedly/Operations/FeedlySyncAllOperation.swift
View File

@ -102,6 +102,7 @@ final class FeedlySyncAllOperation: FeedlyOperation {
override func main() { override func main() {
guard !isCancelled else { guard !isCancelled else {
// override of cancel calls didFinish().
return return
} }