Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ios/Classes/Scanner/BluetoothScanner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class BluetoothScanner: NSObject, CBCentralManagerDelegate, DTGPayloadApi {
private var restartTimer: Timer?;
private let restartIntervalSec: TimeInterval = 120.0
private var shortServiceUuid: String? = nil
private var managerStateContinuation: CheckedContinuation<Int, Never>?

let dispatchQueue: DispatchQueue = DispatchQueue(label: "BluetoothScanner")

private var serviceUUID: CBUUID {
Expand Down Expand Up @@ -78,11 +80,22 @@ class BluetoothScanner: NSObject, CBCentralManagerDelegate, DTGPayloadApi {
scanStateHandler.send(centralManager.isScanning)
}

func managerState() -> Int{
return centralManager.state.rawValue
func managerState() async -> Int {
if centralManager.state != .unknown {
return centralManager.state.rawValue
}

// If state is .unknown, wait for update of CBCentralManager state
return await withCheckedContinuation { continuation in
self.managerStateContinuation = continuation
}
}

func centralManagerDidUpdateState(_ central: CBCentralManager) {
if let continuation = managerStateContinuation {
managerStateContinuation = nil
continuation.resume(returning: central.state.rawValue)
}
updateScanState()
}

Expand Down
2 changes: 1 addition & 1 deletion ios/Classes/SwiftFlutterOpendroneidPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public class SwiftFlutterOpendroneidPlugin: NSObject, FlutterPlugin, DTGApi{
guard let scanner = bluetoothScanner else {
return (nil, PluginNotInitializedException())
}
return ((scanner.managerState()) as NSNumber?, nil)
return ((await scanner.managerState()) as NSNumber?, nil)
}

public func wifiState() async -> (NSNumber?, FlutterError?) {
Expand Down