summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2022-03-28 14:41:09 +0200
committerAndrej Mihajlov <and@mullvad.net>2022-03-31 14:39:43 +0200
commit5507c5f48b9bed77e795d933382b778a79c51cf0 (patch)
tree8fffd718b9226036cfa7231da951a0fecb123f1c
parentd71995c950f87e0866862bc2c6191d2e2e59deb8 (diff)
downloadmullvadvpn-5507c5f48b9bed77e795d933382b778a79c51cf0.tar.xz
mullvadvpn-5507c5f48b9bed77e795d933382b778a79c51cf0.zip
AsyncBlockOperation: override finish()
-rw-r--r--ios/MullvadVPN/Operations/AsyncBlockOperation.swift15
1 files changed, 8 insertions, 7 deletions
diff --git a/ios/MullvadVPN/Operations/AsyncBlockOperation.swift b/ios/MullvadVPN/Operations/AsyncBlockOperation.swift
index c02577471f..66a6d2aa0b 100644
--- a/ios/MullvadVPN/Operations/AsyncBlockOperation.swift
+++ b/ios/MullvadVPN/Operations/AsyncBlockOperation.swift
@@ -24,6 +24,14 @@ class AsyncBlockOperation: AsyncOperation {
executionBlock = nil
}
+ override func finish() {
+ stateLock.lock()
+ cancellationBlocks.removeAll()
+ stateLock.unlock()
+
+ super.finish()
+ }
+
override func cancel() {
super.cancel()
@@ -39,7 +47,6 @@ class AsyncBlockOperation: AsyncOperation {
func addCancellationBlock(_ block: @escaping () -> Void) {
stateLock.lock()
-
if isCancelled {
stateLock.unlock()
block()
@@ -48,10 +55,4 @@ class AsyncBlockOperation: AsyncOperation {
stateLock.unlock()
}
}
-
- override func operationDidFinish() {
- stateLock.lock()
- cancellationBlocks.removeAll()
- stateLock.unlock()
- }
}