nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This should fix some connection problems #274 

Some APIs have become synchronous, it seems, e.g.
connectGatt() -> onConnectionStateChanged() -> discoverServices() -> onServicesDiscovered()
appears to happen synchronously. So connectGatt() will not return before services are discovered!

So now we deal with this situation.
This commit is contained in:
cpfeiffer 2016-05-26 19:03:38 +02:00
parent b0e0aec465
commit c360eb3392
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
View File

@ -147,7 +147,6 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
} }
private void gattServicesDiscovered(List<BluetoothGattService> discoveredGattServices) { private void gattServicesDiscovered(List<BluetoothGattService> discoveredGattServices) {
if (discoveredGattServices == null) { if (discoveredGattServices == null) {
return; return;
} }
@ -180,7 +179,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
@Override @Override
public void onServicesDiscovered(BluetoothGatt gatt) { public void onServicesDiscovered(BluetoothGatt gatt) {
gattServicesDiscovered(getQueue().getSupportedGattServices()); gattServicesDiscovered(gatt.getServices());
initializeDevice(createTransactionBuilder("Initializing device")).queue(getQueue()); initializeDevice(createTransactionBuilder("Initializing device")).queue(getQueue());
} }

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
View File

@ -308,6 +308,12 @@ public final class BtLEQueue {
public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
LOG.debug("connection state change, newState: " + newState + getStatusString(status)); LOG.debug("connection state change, newState: " + newState + getStatusString(status));
synchronized (mGattMonitor) {
if (mBluetoothGatt == null) {
mBluetoothGatt = gatt;
}
}
if (!checkCorrectGattInstance(gatt, "connection state event")) { if (!checkCorrectGattInstance(gatt, "connection state event")) {
return; return;
} }