Misc polish

Author: jdmoreira

YubiKit/YubiKit/NFCConnection.swift

@@ -170,40 +170,42 @@ private final actor NFCConnectionManager: NSObject {
     private var _currentState = State.inactive
     private var currentState: State {
         get { _currentState }
-        set { set(state: newValue) }
+        set {
+            trace(message: "State: \(currentState) → \(newValue)")
+
+            defer { _currentState = newValue }
+
+            switch (currentState, newValue) {
+
+            // Jump to 'connected'
+            case (.inactive, let .connected(_, newTag)):
+                connection = connection ?? .init()
+                didCloseConnection = nil
+                fallthrough
+            case (.scanning, let .connected(_, newTag)):
+                didCloseConnection = .init()
+                Task { await connection!.fulfill(.init(tag: ISO7816Identifier(newTag.identifier))) }
+
+            // Jump to 'scanning'
+            case (_, .scanning):
+                connection = connection ?? .init()
+                didCloseConnection = nil
+
+            // Jump to 'inactive'
+            case (.connected, .inactive):
+                fallthrough
+            case (.scanning, .inactive):
+                connection = nil
+                didCloseConnection = nil
+
+            default:
+                return
+            }
+        }
     }
 
     private func set(state newValue: State) {
-        trace(message: "State: \(currentState) → \(newValue)")
-
-        defer { _currentState = newValue }
-
-        switch (currentState, newValue) {
-
-        // Jump to 'connected'
-        case (.inactive, let .connected(_, newTag)):
-            connection = connection ?? .init()
-            didCloseConnection = nil
-            fallthrough
-        case (.scanning, let .connected(_, newTag)):
-            didCloseConnection = .init()
-            Task { await connection!.fulfill(.init(tag: ISO7816Identifier(newTag.identifier))) }
-
-        // Jump to 'scanning'
-        case (_, .scanning):
-            connection = connection ?? .init()
-            didCloseConnection = nil
-
-        // Jump to 'inactive'
-        case (.connected, .inactive):
-            fallthrough
-        case (.scanning, .inactive):
-            connection = nil
-            didCloseConnection = nil
-
-        default:
-            return
-        }
+        currentState = newValue
     }
 
     // @TraceScope