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

Let all clean up steps run when disconnecting

Browse Source
This commit is contained in:
Erik Johansson
2018-06-17 20:53:58 +02:00
parent ae07a7f5d3
commit 0350173a2b
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,10 @@ public abstract class BluetoothCommunication {
* @param infoText the information text that is displayed to the status code. * @param infoText the information text that is displayed to the status code.
*/ */
protected void setBtStatus(BT_STATUS_CODE statusCode, String infoText) { protected void setBtStatus(BT_STATUS_CODE statusCode, String infoText) {
callbackBtHandler.obtainMessage(statusCode.ordinal(), infoText).sendToTarget(); if (callbackBtHandler != null) {
callbackBtHandler.obtainMessage(
statusCode.ordinal(), infoText).sendToTarget();
}
} }
/** /**
@@ -135,7 +138,10 @@ public abstract class BluetoothCommunication {
* @param scaleMeasurement the scale data that should be added to openScale * @param scaleMeasurement the scale data that should be added to openScale
*/ */
protected void addScaleData(ScaleMeasurement scaleMeasurement) { protected void addScaleData(ScaleMeasurement scaleMeasurement) {
callbackBtHandler.obtainMessage(BT_STATUS_CODE.BT_RETRIEVE_SCALE_DATA.ordinal(), scaleMeasurement).sendToTarget(); if (callbackBtHandler != null) {
callbackBtHandler.obtainMessage(
BT_STATUS_CODE.BT_RETRIEVE_SCALE_DATA.ordinal(), scaleMeasurement).sendToTarget();
}
} }
/** /**
@@ -145,7 +151,10 @@ public abstract class BluetoothCommunication {
* @param value the value to be used * @param value the value to be used
*/ */
protected void sendMessage(int msg, Object value) { protected void sendMessage(int msg, Object value) {
callbackBtHandler.obtainMessage(BT_STATUS_CODE.BT_SCALE_MESSAGE.ordinal(), msg, 0, value).sendToTarget(); if (callbackBtHandler != null) {
callbackBtHandler.obtainMessage(
BT_STATUS_CODE.BT_SCALE_MESSAGE.ordinal(), msg, 0, value).sendToTarget();
}
} }
/** /**
@@ -496,17 +505,32 @@ public abstract class BluetoothCommunication {
Timber.i("Disconnecting%s", doCleanup ? " (with cleanup)" : ""); Timber.i("Disconnecting%s", doCleanup ? " (with cleanup)" : "");
handler.removeCallbacksAndMessages(null);
callbackBtHandler = null;
if (doCleanup) { if (doCleanup) {
if (btMachineState != BT_MACHINE_STATE.BT_CLEANUP_STATE) { if (btMachineState != BT_MACHINE_STATE.BT_CLEANUP_STATE) {
setBtMachineState(BT_MACHINE_STATE.BT_CLEANUP_STATE); setBtMachineState(BT_MACHINE_STATE.BT_CLEANUP_STATE);
nextMachineStateStep(); nextMachineStateStep();
} }
handler.post(new Runnable() {
@Override
public void run() {
synchronized (lock) {
if (openRequest) {
handler.postDelayed(this, 10);
} else {
bluetoothGatt.close();
bluetoothGatt = null;
}
}
}
});
}
else {
bluetoothGatt.close();
bluetoothGatt = null;
} }
bluetoothGatt.close();
bluetoothGatt = null;
setBtStatus(BT_STATUS_CODE.BT_CONNECTION_LOST);
} }
} }