aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-24 01:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Glucose: minor improvements

Browse Source
This commit is contained in:
Aleksander Nowakowski
2020-02-20 10:36:31 +01:00
parent 1301067781
commit c63948bd07
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/ExpandableRecordAdapter.java
View File

@@ -39,8 +39,8 @@ public class ExpandableRecordAdapter extends BaseExpandableListAdapter {;
private final Context context;
private SparseArray<GlucoseRecord> records;
public ExpandableRecordAdapter(final Context context, final GlucoseManager manager) {
glucoseManager = manager;
ExpandableRecordAdapter(final Context context, final GlucoseManager manager) {
this.glucoseManager = manager;
this.context = context;
inflater = LayoutInflater.from(context);
records = manager.getRecords().clone();

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java
View File

@@ -81,8 +81,8 @@ public class GlucoseActivity extends BleProfileExpandableListActivity implements
@Override
protected LoggableBleManager<GlucoseManagerCallbacks> initializeManager() {
GlucoseManager manager = glucoseManager = GlucoseManager.getGlucoseManager(getApplicationContext());
manager.setGattCallbacks(this);
final GlucoseManager manager = glucoseManager = GlucoseManager.getGlucoseManager(getApplicationContext());
manager.setManagerCallbacks(this);
return manager;
}

33
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java
View File

@@ -301,7 +301,10 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
*/
public void clear() {
records.clear();
callbacks.onOperationCompleted(getBluetoothDevice());
final BluetoothDevice target = getBluetoothDevice();
if (target != null) {
callbacks.onOperationCompleted(target);
}
}
/**
@@ -312,9 +315,12 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void getLastRecord() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
callbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportLastStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -328,9 +334,12 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void getFirstRecord() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
callbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportFirstStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -345,9 +354,12 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void getAllRecords() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
callbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportNumberOfAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -366,11 +378,14 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void refreshRecords() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
if (records.size() == 0) {
getAllRecords();
} else {
callbacks.onOperationStarted(getBluetoothDevice());
callbacks.onOperationStarted(target);
// obtain the last sequence number
final int sequenceNumber = records.keyAt(records.size() - 1) + 1;
@@ -390,6 +405,9 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void abort() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.abortOperation())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
@@ -403,9 +421,12 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
void deleteAllRecords() {
if (recordAccessControlPointCharacteristic == null)
return;
final BluetoothDevice target = getBluetoothDevice();
if (target == null)
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
callbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.deleteAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();