AsyncOperation: add shortcuts for cancellation and completion events observation

2 files changed, 13 insertions, 4 deletions

diff --git a/ios/Operations/AsyncOperation.swift b/ios/Operations/AsyncOperation.swift
index 2939f0708e..78ae2fa627 100644
--- a/ios/Operations/AsyncOperation.swift
+++ b/ios/Operations/AsyncOperation.swift
@@ -422,6 +422,17 @@ public protocol OperationBlockObserverSupport {}
 extension AsyncOperation: OperationBlockObserverSupport {}
 
 extension OperationBlockObserverSupport where Self: AsyncOperation {
+    /// Add observer responding to cancellation event.
+    public func onCancel(_ fn: @escaping (Self) -> Void) {
+        addBlockObserver(OperationBlockObserver(didCancel: fn))
+    }
+
+    /// Add observer responding to finish event.
+    public func onFinish(_ fn: @escaping (Self, Error?) -> Void) {
+        addBlockObserver(OperationBlockObserver(didFinish: fn))
+    }
+
+    /// Add block-based observer.
     public func addBlockObserver(_ observer: OperationBlockObserver<Self>) {
         addObserver(observer)
     }
diff --git a/ios/Operations/AsyncOperationQueue.swift b/ios/Operations/AsyncOperationQueue.swift
index 4579546084..d1269a8175 100644
--- a/ios/Operations/AsyncOperationQueue.swift
+++ b/ios/Operations/AsyncOperationQueue.swift
@@ -73,11 +73,9 @@ private final class ExclusivityManager {
 
             operationsByCategory[category] = operations
 
-            let blockObserver = OperationBlockObserver(didFinish: { [weak self] op, error in
+            operation.onFinish { [weak self] op, error in
                 self?.removeOperation(op, categories: categories)
-            })
-
-            operation.addObserver(blockObserver)
+            }
         }
     }