mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 14:31:23 +02:00
Code Issues Releases Wiki Activity

Wait a bit between stopping LE scan and connecting

Browse Source 
To see if it helps @ReidarHH in #335
This commit is contained in:
Erik Johansson
2018-10-08 21:36:19 +02:00
parent 2f1b7663b7
commit 960c7e8f30
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -427,7 +427,7 @@ public abstract class BluetoothCommunication {
}
else {
Timber.d("No coarse location permission, connecting without LE scan");
connectGatt(hwAddress);
connectGatt(btAdapter.getRemoteDevice(hwAddress));
}
}
@@ -460,8 +460,16 @@ public abstract class BluetoothCommunication {
}
}
private void connectGatt(String hwAddress) {
connectGatt(btAdapter.getRemoteDevice(hwAddress));
private void stopLeScanAndConnectGatt(final BluetoothDevice device) {
stopLeScan();
// Delay the call to connectGatt to let things settle a bit
handler.postDelayed(new Runnable() {
@Override
public void run() {
connectGatt(device);
}
}, 500);
}
private void startLeScanForDevice(final String hwAddress) {
@@ -476,27 +484,28 @@ public abstract class BluetoothCommunication {
handler.post(new Runnable() {
@Override
public void run() {
// Check that callback != null in case the same device is found multiple times
// and thus multiple calls to connect to it are queued. Only the first will
// have callback != null.
if (leScanCallback != null) {
stopLeScan();
connectGatt(device);
stopLeScanAndConnectGatt(device);
}
}
});
}
};
Timber.d("Starting LE scan for device [%s]", hwAddress);
btAdapter.startLeScan(leScanCallback);
// Stop scan and try to connect to the device directly if the device isn't found in time
handler.postAtTime(new Runnable() {
@Override
public void run() {
Timber.d("Device not found in LE scan, connecting directly");
stopLeScan();
connectGatt(hwAddress);
stopLeScanAndConnectGatt(btAdapter.getRemoteDevice(hwAddress));
}
}, leScanCallback, SystemClock.uptimeMillis() + LE_SCAN_TIMEOUT_MS);
Timber.d("Starting LE scan for device [%s]", hwAddress);
btAdapter.startLeScan(leScanCallback);
}
private void stopLeScan() {
@@ -515,6 +524,8 @@ public abstract class BluetoothCommunication {
stopLeScan();
if (bluetoothGatt == null) {
// Could be a pending connectGatt waiting
handler.removeCallbacksAndMessages(null);
return;
}