aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-21 23:54:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: Closing gatt in synchronized block

Browse Source 
Otherwise the mBluetoothGatt.close() may throw NPE
This commit is contained in:
Aleksander Nowakowski
2016-10-05 12:54:49 +02:00
parent 33cc4d0433
commit e06677e883
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
View File

@@ -80,6 +80,7 @@ public abstract class BleManager<E extends BleManagerCallbacks> {
private final static String ERROR_WRITE_DESCRIPTOR = "Error on writing descriptor";
private final static String ERROR_READ_CHARACTERISTIC = "Error on reading characteristic";
private final Object mLock = new Object();
/**
* The log session or null if nRF Logger is not installed.
*/
@@ -197,18 +198,20 @@ public abstract class BleManager<E extends BleManagerCallbacks> {
if (mConnected)
return;
if (mBluetoothGatt != null) {
Logger.d(mLogSession, "gatt.close()");
mBluetoothGatt.close();
mBluetoothGatt = null;
}
synchronized (mLock) {
if (mBluetoothGatt != null) {
Logger.d(mLogSession, "gatt.close()");
mBluetoothGatt.close();
mBluetoothGatt = null;
}
final boolean autoConnect = shouldAutoConnect();
mUserDisconnected = !autoConnect; // We will receive Linkloss events only when the device is connected with autoConnect=true
Logger.v(mLogSession, "Connecting...");
Logger.d(mLogSession, "gatt = device.connectGatt(autoConnect = " + autoConnect + ")");
mBluetoothDevice = device;
mBluetoothGatt = device.connectGatt(mContext, autoConnect, getGattCallback());
final boolean autoConnect = shouldAutoConnect();
mUserDisconnected = !autoConnect; // We will receive Linkloss events only when the device is connected with autoConnect=true
Logger.v(mLogSession, "Connecting...");
Logger.d(mLogSession, "gatt = device.connectGatt(autoConnect = " + autoConnect + ")");
mBluetoothDevice = device;
mBluetoothGatt = device.connectGatt(mContext, autoConnect, getGattCallback());
}
}
/**
@@ -245,13 +248,15 @@ public abstract class BleManager<E extends BleManagerCallbacks> {
} catch (Exception e) {
// the receiver must have been not registered or unregistered before
}
if (mBluetoothGatt != null) {
Logger.d(mLogSession, "gatt.close()");
mBluetoothGatt.close();
mBluetoothGatt = null;
synchronized (mLock) {
if (mBluetoothGatt != null) {
Logger.d(mLogSession, "gatt.close()");
mBluetoothGatt.close();
mBluetoothGatt = null;
}
mBluetoothDevice = null;
mUserDisconnected = false;
}
mBluetoothDevice = null;
mUserDisconnected = false;
}
/**