@capacitor-community/bluetooth-le 8.0.0-0 → 8.0.0

package/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/DeviceList.kt

@@ -1,28 +1,28 @@
-package com.capacitorjs.community.plugins.bluetoothle
-
-import android.bluetooth.BluetoothDevice
-
-class DeviceList {
-    private val devices: ArrayList<BluetoothDevice> = ArrayList()
-
-    fun addDevice(device: BluetoothDevice): Boolean {
-        // contains compares devices by their address
-        if (!devices.contains(device)) {
-            devices.add(device)
-            return true
-        }
-        return false
-    }
-
-    fun getDevice(index: Int): BluetoothDevice {
-        return devices[index]
-    }
-
-    fun getCount(): Int {
-        return devices.size
-    }
-
-    fun clear() {
-        devices.clear()
-    }
-}
+package com.capacitorjs.community.plugins.bluetoothle
+
+import android.bluetooth.BluetoothDevice
+
+class DeviceList {
+    private val devices: ArrayList<BluetoothDevice> = ArrayList()
+
+    fun addDevice(device: BluetoothDevice): Boolean {
+        // contains compares devices by their address
+        if (!devices.contains(device)) {
+            devices.add(device)
+            return true
+        }
+        return false
+    }
+
+    fun getDevice(index: Int): BluetoothDevice {
+        return devices[index]
+    }
+
+    fun getCount(): Int {
+        return devices.size
+    }
+
+    fun clear() {
+        devices.clear()
+    }
+}

package/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/DeviceScanner.kt

@@ -1,190 +1,190 @@
-package com.capacitorjs.community.plugins.bluetoothle
-
-import android.annotation.SuppressLint
-import android.app.AlertDialog
-import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothDevice
-import android.bluetooth.le.ScanCallback
-import android.bluetooth.le.ScanFilter
-import android.bluetooth.le.ScanResult
-import android.bluetooth.le.ScanSettings
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.widget.ArrayAdapter
-import com.getcapacitor.Logger
-
-
-class ScanResponse(
-    val success: Boolean,
-    val message: String?,
-    val device: BluetoothDevice?,
-)
-
-class DisplayStrings(
-    val scanning: String,
-    val cancel: String,
-    val availableDevices: String,
-    val noDeviceFound: String,
-)
-
-@SuppressLint("MissingPermission")
-class DeviceScanner(
-    private val context: Context,
-    bluetoothAdapter: BluetoothAdapter,
-    private val scanDuration: Long?,
-    private val displayStrings: DisplayStrings,
-    private val showDialog: Boolean,
-) {
-    companion object {
-        private val TAG = DeviceScanner::class.java.simpleName
-    }
-
-    private var isScanning = false
-    private val bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
-    private var savedCallback: ((ScanResponse) -> Unit)? = null
-    private var scanResultCallback: ((ScanResult) -> Unit)? = null
-    private var adapter: ArrayAdapter<String>? = null
-    private val deviceList = DeviceList()
-    private var deviceStrings: ArrayList<String> = ArrayList()
-    private var dialog: AlertDialog? = null
-    private var dialogHandler: Handler? = null
-    private var stopScanHandler: Handler? = null
-    private var allowDuplicates: Boolean = false
-    private var namePrefix: String = ""
-
-    private val scanCallback: ScanCallback = object : ScanCallback() {
-        override fun onScanResult(callbackType: Int, result: ScanResult) {
-            super.onScanResult(callbackType, result)
-            if (namePrefix.isNotEmpty()) {
-                if (result.device.name == null || !result.device.name.startsWith(namePrefix)) {
-                    return
-                }
-            }
-            val isNew = deviceList.addDevice(result.device)
-            if (showDialog) {
-                if (isNew) {
-                    dialogHandler?.post {
-                        deviceStrings.add("[${result.device.address}] ${result.device.name ?: "Unknown"}")
-                        adapter?.notifyDataSetChanged()
-                    }
-                }
-            } else {
-                if (allowDuplicates || isNew) {
-                    scanResultCallback?.invoke(result)
-                }
-            }
-        }
-    }
-
-    fun startScanning(
-        scanFilters: List<ScanFilter>,
-        scanSettings: ScanSettings,
-        allowDuplicates: Boolean,
-        namePrefix: String,
-        callback: (ScanResponse) -> Unit,
-        scanResultCallback: ((ScanResult) -> Unit)?
-    ) {
-        this.savedCallback = callback
-        this.scanResultCallback = scanResultCallback
-        this.allowDuplicates = allowDuplicates
-        this.namePrefix = namePrefix
-
-        deviceStrings.clear()
-        deviceList.clear()
-        if (!isScanning) {
-            setTimeoutForStopScanning()
-            Logger.debug(TAG, "Start scanning.")
-            isScanning = true
-            bluetoothLeScanner?.startScan(scanFilters, scanSettings, scanCallback)
-            if (showDialog) {
-                dialogHandler = Handler(Looper.getMainLooper())
-                showDeviceList()
-            } else {
-                savedCallback?.invoke(
-                    ScanResponse(
-                        true, "Started scanning.", null
-                    )
-                )
-                savedCallback = null
-            }
-        } else {
-            stopScanning()
-            savedCallback?.invoke(
-                ScanResponse(
-                    false, "Already scanning. Stopping now.", null
-                )
-            )
-            savedCallback = null
-        }
-    }
-
-    fun stopScanning() {
-        stopScanHandler?.removeCallbacksAndMessages(null)
-        stopScanHandler = null
-        if (showDialog) {
-            dialogHandler?.post {
-                if (deviceList.getCount() == 0) {
-                    dialog?.setTitle(displayStrings.noDeviceFound)
-                } else {
-                    dialog?.setTitle(displayStrings.availableDevices)
-                }
-            }
-        }
-        Logger.debug(TAG, "Stop scanning.")
-        isScanning = false
-        bluetoothLeScanner?.stopScan(scanCallback)
-    }
-
-    private fun showDeviceList() {
-        dialogHandler?.post {
-            val builder = AlertDialog.Builder(context)
-            builder.setTitle(displayStrings.scanning)
-            builder.setCancelable(true)
-            adapter = ArrayAdapter(
-                context, android.R.layout.simple_selectable_list_item, deviceStrings
-            )
-            builder.setAdapter(adapter) { dialog, index ->
-                stopScanning()
-                dialog.dismiss()
-                val device = deviceList.getDevice(index)
-                savedCallback?.invoke(ScanResponse(true, device.address, device))
-                savedCallback = null
-            }
-            builder.setNegativeButton(displayStrings.cancel) { dialog, _ ->
-                stopScanning()
-                dialog.cancel()
-                savedCallback?.invoke(
-                    ScanResponse(
-                        false, "requestDevice cancelled.", null
-                    )
-                )
-                savedCallback = null
-            }
-            builder.setOnCancelListener { dialog ->
-                stopScanning()
-                dialog.cancel()
-                savedCallback?.invoke(
-                    ScanResponse(
-                        false, "requestDevice cancelled.", null
-                    )
-                )
-                savedCallback = null
-            }
-            dialog = builder.create()
-            dialog?.show()
-        }
-    }
-
-    private fun setTimeoutForStopScanning() {
-        if (scanDuration != null) {
-            stopScanHandler = Handler(Looper.getMainLooper())
-            stopScanHandler?.postDelayed(
-                {
-                    stopScanning()
-                }, scanDuration
-            )
-        }
-    }
-
+package com.capacitorjs.community.plugins.bluetoothle
+
+import android.annotation.SuppressLint
+import android.app.AlertDialog
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanResult
+import android.bluetooth.le.ScanSettings
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.widget.ArrayAdapter
+import com.getcapacitor.Logger
+
+
+class ScanResponse(
+    val success: Boolean,
+    val message: String?,
+    val device: BluetoothDevice?,
+)
+
+class DisplayStrings(
+    val scanning: String,
+    val cancel: String,
+    val availableDevices: String,
+    val noDeviceFound: String,
+)
+
+@SuppressLint("MissingPermission")
+class DeviceScanner(
+    private val context: Context,
+    bluetoothAdapter: BluetoothAdapter,
+    private val scanDuration: Long?,
+    private val displayStrings: DisplayStrings,
+    private val showDialog: Boolean,
+) {
+    companion object {
+        private val TAG = DeviceScanner::class.java.simpleName
+    }
+
+    private var isScanning = false
+    private val bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+    private var savedCallback: ((ScanResponse) -> Unit)? = null
+    private var scanResultCallback: ((ScanResult) -> Unit)? = null
+    private var adapter: ArrayAdapter<String>? = null
+    private val deviceList = DeviceList()
+    private var deviceStrings: ArrayList<String> = ArrayList()
+    private var dialog: AlertDialog? = null
+    private var dialogHandler: Handler? = null
+    private var stopScanHandler: Handler? = null
+    private var allowDuplicates: Boolean = false
+    private var namePrefix: String = ""
+
+    private val scanCallback: ScanCallback = object : ScanCallback() {
+        override fun onScanResult(callbackType: Int, result: ScanResult) {
+            super.onScanResult(callbackType, result)
+            if (namePrefix.isNotEmpty()) {
+                if (result.device.name == null || !result.device.name.startsWith(namePrefix)) {
+                    return
+                }
+            }
+            val isNew = deviceList.addDevice(result.device)
+            if (showDialog) {
+                if (isNew) {
+                    dialogHandler?.post {
+                        deviceStrings.add("[${result.device.address}] ${result.device.name ?: "Unknown"}")
+                        adapter?.notifyDataSetChanged()
+                    }
+                }
+            } else {
+                if (allowDuplicates || isNew) {
+                    scanResultCallback?.invoke(result)
+                }
+            }
+        }
+    }
+
+    fun startScanning(
+        scanFilters: List<ScanFilter>,
+        scanSettings: ScanSettings,
+        allowDuplicates: Boolean,
+        namePrefix: String,
+        callback: (ScanResponse) -> Unit,
+        scanResultCallback: ((ScanResult) -> Unit)?
+    ) {
+        this.savedCallback = callback
+        this.scanResultCallback = scanResultCallback
+        this.allowDuplicates = allowDuplicates
+        this.namePrefix = namePrefix
+
+        deviceStrings.clear()
+        deviceList.clear()
+        if (!isScanning) {
+            setTimeoutForStopScanning()
+            Logger.debug(TAG, "Start scanning.")
+            isScanning = true
+            bluetoothLeScanner?.startScan(scanFilters, scanSettings, scanCallback)
+            if (showDialog) {
+                dialogHandler = Handler(Looper.getMainLooper())
+                showDeviceList()
+            } else {
+                savedCallback?.invoke(
+                    ScanResponse(
+                        true, "Started scanning.", null
+                    )
+                )
+                savedCallback = null
+            }
+        } else {
+            stopScanning()
+            savedCallback?.invoke(
+                ScanResponse(
+                    false, "Already scanning. Stopping now.", null
+                )
+            )
+            savedCallback = null
+        }
+    }
+
+    fun stopScanning() {
+        stopScanHandler?.removeCallbacksAndMessages(null)
+        stopScanHandler = null
+        if (showDialog) {
+            dialogHandler?.post {
+                if (deviceList.getCount() == 0) {
+                    dialog?.setTitle(displayStrings.noDeviceFound)
+                } else {
+                    dialog?.setTitle(displayStrings.availableDevices)
+                }
+            }
+        }
+        Logger.debug(TAG, "Stop scanning.")
+        isScanning = false
+        bluetoothLeScanner?.stopScan(scanCallback)
+    }
+
+    private fun showDeviceList() {
+        dialogHandler?.post {
+            val builder = AlertDialog.Builder(context)
+            builder.setTitle(displayStrings.scanning)
+            builder.setCancelable(true)
+            adapter = ArrayAdapter(
+                context, android.R.layout.simple_selectable_list_item, deviceStrings
+            )
+            builder.setAdapter(adapter) { dialog, index ->
+                stopScanning()
+                dialog.dismiss()
+                val device = deviceList.getDevice(index)
+                savedCallback?.invoke(ScanResponse(true, device.address, device))
+                savedCallback = null
+            }
+            builder.setNegativeButton(displayStrings.cancel) { dialog, _ ->
+                stopScanning()
+                dialog.cancel()
+                savedCallback?.invoke(
+                    ScanResponse(
+                        false, "requestDevice cancelled.", null
+                    )
+                )
+                savedCallback = null
+            }
+            builder.setOnCancelListener { dialog ->
+                stopScanning()
+                dialog.cancel()
+                savedCallback?.invoke(
+                    ScanResponse(
+                        false, "requestDevice cancelled.", null
+                    )
+                )
+                savedCallback = null
+            }
+            dialog = builder.create()
+            dialog?.show()
+        }
+    }
+
+    private fun setTimeoutForStopScanning() {
+        if (scanDuration != null) {
+            stopScanHandler = Handler(Looper.getMainLooper())
+            stopScanHandler?.postDelayed(
+                {
+                    stopScanning()
+                }, scanDuration
+            )
+        }
+    }
+
 }

package/ios/Sources/BluetoothLe/Conversion.swift

@@ -1,83 +1,83 @@
-import Foundation
-import CoreBluetooth
-
-func descriptorValueToString(_ value: Any) -> String {
-    // https://developer.apple.com/documentation/corebluetooth/cbdescriptor
-    if let str = value as? String {
-        return dataToString(Data(str.utf8))
-    }
-    if let data = value as? Data {
-        return dataToString(data)
-    }
-    if let num = value as? UInt16 {
-        return dataToString(Data([UInt8(truncatingIfNeeded: num), UInt8(truncatingIfNeeded: num >> 8)]))
-    }
-    return ""
-}
-
-extension Data {
-    func toHexString() -> String {
-        let hexChars = Array("0123456789abcdef".utf8)
-        if #available(iOS 14, *) {
-            return String(unsafeUninitializedCapacity: self.count*2) { (ptr) -> Int in
-                var strp = ptr.baseAddress!
-                for byte in self {
-                    strp[0] = hexChars[Int(byte >> 4)]
-                    strp[1] = hexChars[Int(byte & 0xF)]
-                    strp += 2
-                }
-                return 2 * self.count
-            }
-        } else {
-            // Fallback implementation for iOS < 14, a bit slower
-            var result = ""
-            result.reserveCapacity(self.count * 2)
-            for byte in self {
-                let high = Int(byte >> 4)
-                let low  = Int(byte & 0xF)
-                result.append(Character(UnicodeScalar(hexChars[high])))
-                result.append(Character(UnicodeScalar(hexChars[low])))
-            }
-            return result
-        }
-    }
-}
-
-func dataToString(_ data: Data) -> String {
-    return data.toHexString()
-}
-
-func stringToData(_ dataString: String) -> Data {
-    guard dataString.count % 2 == 0 else {
-        fatalError("Input string must have an even length, not \(dataString.count)")
-    }
-    var data = Data(capacity: dataString.count / 2)
-    for i in stride(from: 0, to: dataString.count, by: 2) {
-        let start = dataString.index(dataString.startIndex, offsetBy: i)
-        let end = dataString.index(start, offsetBy: 2)
-        let hexPair = dataString[start..<end]
-        if let byte = UInt8(hexPair, radix: 16) {
-            data.append(byte)
-        } else {
-            fatalError("Invalid hexadecimal value: \(hexPair)")
-        }
-    }
-    return data
-}
-
-func cbuuidToString(_ uuid: CBUUID) -> String {
-    // declare as optional because of https://github.com/capacitor-community/bluetooth-le/issues/170
-    let uuidString: String? = uuid.uuidString
-    var str = uuidString!.lowercased()
-    if str.count == 4 {
-        str = "0000\(str)-0000-1000-8000-00805f9b34fb"
-    } else if str.count == 8 {
-        str = "\(str)-0000-1000-8000-00805f9b34fb"
-    }
-    return str
-}
-
-func cbuuidToStringUppercase(_ uuid: CBUUID) -> String {
-    let str = cbuuidToString(uuid)
-    return str.uppercased()
-}
+import Foundation
+import CoreBluetooth
+
+func descriptorValueToString(_ value: Any) -> String {
+    // https://developer.apple.com/documentation/corebluetooth/cbdescriptor
+    if let str = value as? String {
+        return dataToString(Data(str.utf8))
+    }
+    if let data = value as? Data {
+        return dataToString(data)
+    }
+    if let num = value as? UInt16 {
+        return dataToString(Data([UInt8(truncatingIfNeeded: num), UInt8(truncatingIfNeeded: num >> 8)]))
+    }
+    return ""
+}
+
+extension Data {
+    func toHexString() -> String {
+        let hexChars = Array("0123456789abcdef".utf8)
+        if #available(iOS 14, *) {
+            return String(unsafeUninitializedCapacity: self.count*2) { (ptr) -> Int in
+                var strp = ptr.baseAddress!
+                for byte in self {
+                    strp[0] = hexChars[Int(byte >> 4)]
+                    strp[1] = hexChars[Int(byte & 0xF)]
+                    strp += 2
+                }
+                return 2 * self.count
+            }
+        } else {
+            // Fallback implementation for iOS < 14, a bit slower
+            var result = ""
+            result.reserveCapacity(self.count * 2)
+            for byte in self {
+                let high = Int(byte >> 4)
+                let low  = Int(byte & 0xF)
+                result.append(Character(UnicodeScalar(hexChars[high])))
+                result.append(Character(UnicodeScalar(hexChars[low])))
+            }
+            return result
+        }
+    }
+}
+
+func dataToString(_ data: Data) -> String {
+    return data.toHexString()
+}
+
+func stringToData(_ dataString: String) -> Data {
+    guard dataString.count % 2 == 0 else {
+        fatalError("Input string must have an even length, not \(dataString.count)")
+    }
+    var data = Data(capacity: dataString.count / 2)
+    for i in stride(from: 0, to: dataString.count, by: 2) {
+        let start = dataString.index(dataString.startIndex, offsetBy: i)
+        let end = dataString.index(start, offsetBy: 2)
+        let hexPair = dataString[start..<end]
+        if let byte = UInt8(hexPair, radix: 16) {
+            data.append(byte)
+        } else {
+            fatalError("Invalid hexadecimal value: \(hexPair)")
+        }
+    }
+    return data
+}
+
+func cbuuidToString(_ uuid: CBUUID) -> String {
+    // declare as optional because of https://github.com/capacitor-community/bluetooth-le/issues/170
+    let uuidString: String? = uuid.uuidString
+    var str = uuidString!.lowercased()
+    if str.count == 4 {
+        str = "0000\(str)-0000-1000-8000-00805f9b34fb"
+    } else if str.count == 8 {
+        str = "\(str)-0000-1000-8000-00805f9b34fb"
+    }
+    return str
+}
+
+func cbuuidToStringUppercase(_ uuid: CBUUID) -> String {
+    let str = cbuuidToString(uuid)
+    return str.uppercased()
+}