public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bluetooth.bluez] Fix the unpairing of all devices on binding disposal (#9011)

Browse Source 
Signed-off-by: Benjamin Lafois <benjamin.lafois@gmail.com>
This commit is contained in:
Benjamin Lafois 2020-11-28 15:59:39 +01:00 committed by GitHub
parent 821a84067a
commit 2730bc8a2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java
View File

@ -120,6 +120,10 @@ public class BlueZBluetoothDevice extends BaseBluetoothDevice implements BlueZEv
public void dispose() { public void dispose() {
BluetoothDevice dev = device; BluetoothDevice dev = device;
if (dev != null) { if (dev != null) {
if (Boolean.TRUE.equals(dev.isPaired())) {
return;
}
try { try {
dev.getAdapter().removeDevice(dev.getRawDevice()); dev.getAdapter().removeDevice(dev.getRawDevice());
} catch (DBusException ex) { } catch (DBusException ex) {
@ -359,8 +363,10 @@ public class BlueZBluetoothDevice extends BaseBluetoothDevice implements BlueZEv
} }
BluetoothCharacteristic c = getCharacteristic(UUID.fromString(characteristic.getUuid())); BluetoothCharacteristic c = getCharacteristic(UUID.fromString(characteristic.getUuid()));
if (c != null) { if (c != null) {
c.setValue(event.getData()); synchronized (c) {
notifyListeners(BluetoothEventType.CHARACTERISTIC_UPDATED, c, BluetoothCompletionStatus.SUCCESS); c.setValue(event.getData());
notifyListeners(BluetoothEventType.CHARACTERISTIC_UPDATED, c, BluetoothCompletionStatus.SUCCESS);
}
} }
} }