fix(ios): do not reject disconnect call when already disconnected

(cherry picked from commit e6873e6)
capacitor-community · Apr 10, 2021 · f488140 · f488140
1 parent 63808ef
commit f488140
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ios/Plugin/DeviceManager.swift b/ios/Plugin/DeviceManager.swift
@@ -214,6 +214,10 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
     func disconnect(_ device: Device, _ callback: @escaping Callback) {
         let key = "disconnect|\(device.getId())"
         self.callbackMap[key] = callback
+        if device.isConnected() == false {
+            self.resolve(key, "Disconnected.")
+            return
+        }
         print("Disconnecting from peripheral", device.getPeripheral())
         self.centralManager.cancelPeripheralConnection(device.getPeripheral())
         self.setTimeout(key, "Disconnection timeout.")

diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift
@@ -137,7 +137,7 @@ public class BluetoothLe: CAPPlugin {
 
     @objc func disconnect(_ call: CAPPluginCall) {
         guard self.getDeviceManager(call) != nil else { return }
-        guard let device = self.getDevice(call) else { return }
+        guard let device = self.getDevice(call, checkConnection: false) else { return }
         self.deviceManager?.disconnect(device, {(success, message) -> Void in
             if success {
                 call.resolve()