Skip to content

Fix resolving and connecting to devices which have different short and full device names #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hohteri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix resolving and connecting to devices which have different short and full device names #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 27 additions & 19 deletions modules/ble/src/main/java/com/gluonhq/attach/ble/impl/IOSBleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public class IOSBleService implements BleService {

private static Consumer<ScanDetection> callback;
private static final ObservableList<BleDevice> devices = FXCollections.observableArrayList();
private static final List<String> deviceNames = new LinkedList<>();
private static final List<String> profileNames = new LinkedList<>();
private static boolean debug;

Expand Down Expand Up @@ -155,7 +154,6 @@ private static void setDetection(String uuid, int major, int minor, int rssi, in
@Override
public ObservableList<BleDevice> startScanningDevices() {
devices.clear();
deviceNames.clear();
profileNames.clear();
startScanningPeripherals();
return devices;
Expand Down Expand Up @@ -221,17 +219,19 @@ private static boolean checkDevice(BleDevice device) {
if (device == null) {
return false;
}
if (device.getName() == null) {
String name = device.getName();
if (name == null) {
if (debug) {
LOG.log(Level.INFO, "IOSBleService: Device with null name not allowed");
}
return false;
}
final boolean check = deviceNames.contains(device.getName());
if (debug) {
LOG.log(Level.INFO, "IOSBleService: Device with name " + device.getName() + " in device list: " + check);
for (BleDevice device2 : devices) {
if (name.equals(device2.getName())) {
return true;
}
}
return check;
return false;
}

// native
Expand All @@ -245,26 +245,34 @@ private static boolean checkDevice(BleDevice device) {
private static native void doSubscribe(String name, String uuidService, String uuidChar, boolean subscribe);

private static void gotPeripheral(String name, String uuid) {
if ((name != null && deviceNames.contains(name)) ||
(name == null && uuid != null && deviceNames.contains(uuid))) {
return;
if (debug) {
LOG.log(Level.INFO, String.format("IOSBleService got peripheral named %s and uuid: %s", name, uuid));
}
if (name != null && uuid != null && deviceNames.contains(uuid)) {
deviceNames.remove(uuid);
devices.removeIf(d -> uuid.equals(d.getAddress()));
if (uuid == null) return;

BleDevice existingDevice = null;
for (BleDevice d : devices) {
if (uuid.equals(d.getAddress())) {
existingDevice = d;
break;
}
}

if (debug) {
LOG.log(Level.INFO, String.format("IOSBleService got peripheral named %s and uuid: %s", name, uuid));
if (existingDevice != null) {
String currentName = existingDevice.getName();
if (name != null && !name.equals(currentName)) {
final BleDevice target = existingDevice;
Platform.runLater(() -> target.setName(name));
}
return;
}

BleDevice dev = new BleDevice();
dev.setName(name);
dev.setAddress(uuid);
Platform.runLater(() -> devices.add(dev));
deviceNames.add(name != null ? name : uuid);

}

private static void gotState(String name, String state) {
if (debug) {
LOG.log(Level.INFO, String.format("BLE device %s changed state to %s", name, state));
Expand Down Expand Up @@ -406,7 +414,7 @@ private static void gotDescriptor(String name, String descName, String data) {
}

private static Optional<BleDevice> getDeviceByName(String name) {
if (name == null || !deviceNames.contains(name)) {
if (name == null) {
return Optional.empty();
}

Expand Down