Skip to content

feat(mobile): cancel BlockOperation in iOS RemoteImageImpl #27522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LeLunZ wants to merge 1 commit into from
Closed

feat(mobile): cancel BlockOperation in iOS RemoteImageImpl #27522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions mobile/ios/Runner/Images/RemoteImagesImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ import MobileCoreServices
import Photos

class RemoteImageRequest: ImageRequest {
private let operationLock = UnfairLock()
weak var task: URLSessionDataTask?
let id: Int64

init(id: Int64, task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
self.id = id
self.task = task
super.init(callback: completion)
private weak var _operation: Operation?
// This needs to be thread safe because operation is set from a background thread, while onCancel is called from the main thread
weak var operation: Operation? {
get { operationLock.withLock { _operation } }
set { operationLock.withLock { _operation = newValue } }
}

init(task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
self.task = task
super.init(callback: completion)
}

override func onCancel() {
task?.cancel()
operation?.cancel()
}
}

Expand Down Expand Up @@ -42,7 +48,7 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {
Self.handleCompletion(requestId: requestId, encoded: preferEncoded, data: data, response: response, error: error)
}

let request = RemoteImageRequest(id: requestId, task: task) { result in
let request = RemoteImageRequest(task: task) { result in
Self.registry.remove(requestId: requestId)
completion(result)
}
Expand Down Expand Up @@ -70,7 +76,7 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {
return request.finish(with: .failure(PigeonError(code: "", message: "No data received", details: nil)))
}

ImageProcessing.queue.addOperation {
let operation = BlockOperation {
if request.isCancelled { return }

// Return raw encoded bytes when requested (for animated images)
Expand All @@ -91,6 +97,9 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {
return request.finish(with: .failure(PigeonError(code: "", message: "Failed to convert image for request: \(error)", details: nil)))
}
}

request.operation = operation
ImageProcessing.queue.addOperation(operation)
}

func cancelRequest(requestId: Int64) {
Expand Down
Loading