Merge branch 'fix-swiftlint-warnings-in-xcode-ios-296'

2 files changed, 35 insertions, 25 deletions

diff --git a/ios/Operations/AsyncOperation.swift b/ios/Operations/AsyncOperation.swift
index ea8edb24c4..638d6ff415 100644
--- a/ios/Operations/AsyncOperation.swift
+++ b/ios/Operations/AsyncOperation.swift
@@ -392,6 +392,8 @@ open class AsyncOperation: Operation {
     }
 }
 
+extension AsyncOperation: OperationBlockObserverSupport {}
+
 extension Operation {
     public func addDependencies(_ dependencies: [Operation]) {
         for dependency in dependencies {
@@ -399,28 +401,3 @@ extension Operation {
         }
     }
 }
-
-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 observer responding to start event.
-    public func onStart(_ fn: @escaping (Self) -> Void) {
-        addBlockObserver(OperationBlockObserver(didStart: fn))
-    }
-
-    /// Add block-based observer.
-    public func addBlockObserver(_ observer: OperationBlockObserver<Self>) {
-        addObserver(observer)
-    }
-}
diff --git a/ios/Operations/OperationBlockObserverSupport.swift b/ios/Operations/OperationBlockObserverSupport.swift
new file mode 100644
index 0000000000..9f9855abff
--- /dev/null
+++ b/ios/Operations/OperationBlockObserverSupport.swift
@@ -0,0 +1,33 @@
+//
+//  OperationBlockObserverSupport.swift
+//  Operations
+//
+//  Created by Jon Petersson on 2023-09-07.
+//  Copyright © 2023 Mullvad VPN AB. All rights reserved.
+//
+
+import Foundation
+
+public protocol 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 observer responding to start event.
+    public func onStart(_ fn: @escaping (Self) -> Void) {
+        addBlockObserver(OperationBlockObserver(didStart: fn))
+    }
+
+    /// Add block-based observer.
+    public func addBlockObserver(_ observer: OperationBlockObserver<Self>) {
+        addObserver(observer)
+    }
+}