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

[bluetooth] Graciously handle systems without DBus (#10153)

This commit is contained in:
Kai Kreuzer 2021-04-08 22:27:41 +02:00 committed by GitHub
parent c5a2882a16
commit 11b24a551a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerFactory.java
View File

@ -51,7 +51,7 @@ public class DeviceManagerFactory {
private final BlueZPropertiesChangedHandler changeHandler = new BlueZPropertiesChangedHandler();
private @Nullable CompletableFuture<DeviceManager> deviceManagerFuture;
private @Nullable CompletableFuture<@Nullable DeviceManager> deviceManagerFuture;
private @Nullable CompletableFuture<DeviceManagerWrapper> deviceManagerWrapperFuture;
public BlueZPropertiesChangedHandler getPropertiesChangedHandler() {
@ -79,7 +79,13 @@ public class DeviceManagerFactory {
// Experimental - seems reuse does not work
} catch (IllegalStateException e) {
// Exception caused by first call to the library
return DeviceManager.createInstance(false);
try {
return DeviceManager.createInstance(false);
} catch (DBusException ex) {
// we might be on a system without DBus, such as macOS or Windows
logger.debug("Failed to initialize DeviceManager: {}", ex.getMessage());
return null;
}
}
}, scheduler);
@ -90,8 +96,10 @@ public class DeviceManagerFactory {
int count = tryCount.incrementAndGet();
try {
logger.debug("Registering property handler attempt: {}", count);
devManager.registerPropertyHandler(changeHandler);
logger.debug("Successfully registered property handler");
if (devManager != null) {
devManager.registerPropertyHandler(changeHandler);
logger.debug("Successfully registered property handler");
}
return new DeviceManagerWrapper(devManager);
} catch (DBusException e) {
if (count < 3) {
@ -103,7 +111,12 @@ public class DeviceManagerFactory {
}, scheduler);
}).whenComplete((devManagerWrapper, th) -> {
if (th != null) {
logger.warn("Failed to initialize DeviceManager: {}", th.getMessage());
if (th.getCause() instanceof DBusException) {
// we might be on a system without DBus, such as macOS or Windows
logger.debug("Failed to initialize DeviceManager: {}", th.getMessage());
} else {
logger.warn("Failed to initialize DeviceManager: {}", th.getMessage());
}
}
});
}
@ -114,7 +127,11 @@ public class DeviceManagerFactory {
if (stage1 != null) {
if (!stage1.cancel(true)) {
// a failure to cancel means that the stage completed normally
stage1.thenAccept(DeviceManager::closeConnection);
stage1.thenAccept(devManager -> {
if (devManager != null) {
devManager.closeConnection();
}
});
}
}
this.deviceManagerFuture = null;

36
bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerWrapper.java
View File

@ -14,6 +14,7 @@ package org.openhab.binding.bluetooth.bluez.internal;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@ -32,25 +33,32 @@ import com.github.hypfvieh.bluetooth.wrapper.BluetoothDevice;
@NonNullByDefault
public class DeviceManagerWrapper {
private DeviceManager deviceManager;
private @Nullable DeviceManager deviceManager;
public DeviceManagerWrapper(DeviceManager deviceManager) {
public DeviceManagerWrapper(@Nullable DeviceManager deviceManager) {
this.deviceManager = deviceManager;
}
public synchronized Collection<BluetoothAdapter> scanForBluetoothAdapters() {
return deviceManager.scanForBluetoothAdapters();
if (deviceManager != null) {
return deviceManager.scanForBluetoothAdapters();
} else {
return Set.of();
}
}
public synchronized @Nullable BluetoothAdapter getAdapter(BluetoothAddress address) {
// we don't use `deviceManager.getAdapter` here since it might perform a scan if the adapter is missing.
String addr = address.toString();
List<BluetoothAdapter> adapters = deviceManager.getAdapters();
if (adapters != null) {
for (BluetoothAdapter btAdapter : adapters) {
String btAddr = btAdapter.getAddress();
if (addr.equalsIgnoreCase(btAddr)) {
return btAdapter;
DeviceManager devMgr = deviceManager;
if (devMgr != null) {
// we don't use `deviceManager.getAdapter` here since it might perform a scan if the adapter is missing.
String addr = address.toString();
List<BluetoothAdapter> adapters = devMgr.getAdapters();
if (adapters != null) {
for (BluetoothAdapter btAdapter : adapters) {
String btAddr = btAdapter.getAddress();
if (addr.equalsIgnoreCase(btAddr)) {
return btAdapter;
}
}
}
}
@ -58,6 +66,10 @@ public class DeviceManagerWrapper {
}
public synchronized List<BluetoothDevice> getDevices(BluetoothAdapter adapter) {
return deviceManager.getDevices(adapter.getAddress(), true);
if (deviceManager != null) {
return deviceManager.getDevices(adapter.getAddress(), true);
} else {
return List.of();
}
}
}