mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-29 02:59:57 +02:00
Code Issues Releases Wiki Activity

Stop LE scan before connecting to discovered device

Browse Source 
See #278
This commit is contained in:
Erik Johansson
2018-06-14 21:56:52 +02:00
parent ffa25af1bc
commit a4a27d2f7e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,6 +409,7 @@ public abstract class BluetoothCommunication {
return; return;
} }
synchronized (lock) { synchronized (lock) {
stopLeScan();
connectGatt(device); connectGatt(device);
} }
} }
@@ -455,15 +456,20 @@ public abstract class BluetoothCommunication {
} }
} }
private void stopLeScan() {
if (leScanCallback != null) {
Timber.d("Stopping LE scan");
btAdapter.stopLeScan(leScanCallback);
leScanCallback = null;
}
}
/** /**
* Disconnect from a Bluetooth device * Disconnect from a Bluetooth device
*/ */
public void disconnect(boolean doCleanup) { public void disconnect(boolean doCleanup) {
synchronized (lock) { synchronized (lock) {
if (leScanCallback != null) { stopLeScan();
btAdapter.stopLeScan(leScanCallback);
leScanCallback = null;
}
if (bluetoothGatt == null) { if (bluetoothGatt == null) {
return; return;
@@ -563,10 +569,7 @@ public abstract class BluetoothCommunication {
if (newState == BluetoothProfile.STATE_CONNECTED) { if (newState == BluetoothProfile.STATE_CONNECTED) {
synchronized (lock) { synchronized (lock) {
if (leScanCallback != null) { stopLeScan();
btAdapter.stopLeScan(leScanCallback);
leScanCallback = null;
}
} }
connectionEstablished = true; connectionEstablished = true;