Fix pairing session check

StanfordSpezi · Jun 22, 2024 · 6ca3147 · 6ca3147
1 parent 4aa2d0a
commit 6ca3147
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Sources/SpeziDevices/Devices/PairableDevice.swift b/Sources/SpeziDevices/Devices/PairableDevice.swift
@@ -97,7 +97,7 @@ extension PairableDevice {
         }
 
 
-        try await pairing.pairingSession {
+        try await pairing.withPairingSession {
             await connect()
 
             async let _ = withTimeout(of: .seconds(15)) {

diff --git a/Sources/SpeziDevices/Model/PairingContinuation.swift b/Sources/SpeziDevices/Model/PairingContinuation.swift
@@ -20,7 +20,7 @@ public final class PairingContinuation {
     /// Create a new pairing continuation management object.
     public init() {}
 
-    func pairingSession<T>(_ action: () async throws -> T) async throws -> T {
+    func withPairingSession<T>(_ action: () async throws -> T) async throws -> T {
         try lock.withLock {
             guard !isInSession else {
                 throw DevicePairingError.busy
@@ -40,11 +40,12 @@ public final class PairingContinuation {
     }
 
     func assign(continuation: CheckedContinuation<Void, Error>) {
-        if lock.try() {
-            lock.unlock()
-            preconditionFailure("Tried to assign continuation outside of calling pairingSession(_:)")
+        lock.withLock {
+            guard isInSession else {
+                preconditionFailure("Tried to assign continuation outside of calling withPairingSession(_:)")
+            }
+            self.pairingContinuation = continuation
         }
-        self.pairingContinuation = continuation
     }
 
     private func resumePairingContinuation(with result: Result<Void, Error>) {