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

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

Browse Source
This commit is contained in:
Maurice Parker 2020-01-19 18:36:45 -07:00
commit f3802488c3
7 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate,
override func didCancel() {
operationQueue.cancelAllOperations()
addCompletionHandler = nil
super.didCancel()
}
func feedlyOperation(_ operation: FeedlyOperation, didFailWith error: Error) {

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

@ -64,6 +64,7 @@ class FeedlyAddNewFeedOperation: FeedlyOperation, FeedlyOperationDelegate, Feedl
override func didCancel() {
operationQueue.cancelAllOperations()
addCompletionHandler = nil
super.didCancel()
}
func feedlySearchOperation(_ operation: FeedlySearchOperation, didGet response: FeedlyFeedsSearchResponse) {

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

@ -73,7 +73,7 @@ class FeedlyDownloadArticlesOperation: FeedlyOperation {
// TODO: fix error on below line: "Expression type '()' is ambiguous without more context"
//os_log(.debug, log: log, "Cancelling %{public}@.", self)
operationQueue.cancelAllOperations()
didFinish()
super.didCancel()
}
}

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

@ -48,6 +48,7 @@ class FeedlyOperation: MainThreadOperation {
if !isCanceled {
operationDelegate?.operationDidComplete(self)
}
downloadProgress?.completeTask()
}
func didFinish(with error: Error) {
@ -56,5 +57,6 @@ class FeedlyOperation: MainThreadOperation {
}
func didCancel() {
didFinish()
}
}

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

@ -138,6 +138,7 @@ final class FeedlySyncAllOperation: FeedlyOperation {
os_log(.debug, log: log, "Cancelling sync %{public}@", syncUUID.uuidString)
self.operationQueue.cancelAllOperations()
syncCompletionHandler = nil
super.didCancel()
}
}

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

@ -52,6 +52,7 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD
override func didCancel() {
os_log(.debug, log: log, "Canceling sync stream contents")
operationQueue.cancelAllOperations()
super.didCancel()
}
func enqueueOperations(for continuation: String?) {

2
xcconfig/common/NetNewsWire_ios_target_common.xcconfig
View File

@ -1,7 +1,7 @@
// High Level Settings common to both the iOS application and any extensions we bundle with it
MARKETING_VERSION = 5.0
CURRENT_PROJECT_VERSION = 27
CURRENT_PROJECT_VERSION = 28
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon