From 26d218e551f7fca62ff5545284c1a79c5b58043e Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 31 Jan 2020 15:06:16 +0100 Subject: [PATCH] Changes required for BLE Library 2.2.0-alpha06 --- app/build.gradle | 4 ++-- .../no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java | 6 +++--- .../no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java | 6 +++--- .../no/nordicsemi/android/nrftoolbox/csc/CSCManager.java | 6 +++--- .../nordicsemi/android/nrftoolbox/gls/GlucoseManager.java | 6 +++--- .../java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java | 6 +++--- .../java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java | 6 +++--- .../android/nrftoolbox/proximity/ProximityManager.java | 6 +++--- .../android/nrftoolbox/template/TemplateManager.java | 6 +++--- .../no/nordicsemi/android/nrftoolbox/uart/UARTManager.java | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2459738b..12228520 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,11 +57,11 @@ dependencies { // Import the BLE Common Library. // The BLE Common Library depends on BLE Library. It is enough to include the first one. - // implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha05' + implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha06' // The BLE Common Library may be included from jcenter. If you want to modify the code, // clone both projects from GitHub and replace the line above with the following // (and also the according lines in the settings.gradle): - implementation project(':ble-common') + // implementation project(':ble-common') implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java index e787002d..2edc8ab8 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java @@ -71,14 +71,14 @@ public class BPMManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new BloodPressureManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving notification, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class BloodPressureManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -161,5 +161,5 @@ public class BPMManager extends BatteryManager { icpCharacteristic = null; bpmCharacteristic = null; } - }; + } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java index 8ea4e24c..b49b6562 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java @@ -87,14 +87,14 @@ class CGMManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new CGMManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving notification, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class CGMManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -327,7 +327,7 @@ class CGMManager extends BatteryManager { cgmSpecificOpsControlPointCharacteristic = null; recordAccessControlPointCharacteristic = null; } - }; + } /** * Returns a list of CGM records obtained from this device. The key in the array is the diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java index 3997fed3..58aac074 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java @@ -60,14 +60,14 @@ public class CSCManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new CSCManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class CSCManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -128,5 +128,5 @@ public class CSCManager extends BatteryManager { super.onDeviceDisconnected(); cscMeasurementCharacteristic = null; } - }; + } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java index 40debd37..caf5d72a 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java @@ -88,14 +88,14 @@ public class GlucoseManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new GlucoseManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving notification, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class GlucoseManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -285,7 +285,7 @@ public class GlucoseManager extends BatteryManager { glucoseMeasurementContextCharacteristic = null; recordAccessControlPointCharacteristic = null; } - }; + } /** * Returns all records as a sparse array where sequence number is the key. diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java index fdc91d93..dda80186 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java @@ -76,14 +76,14 @@ public class HRManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new HeartRateManagerCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving notification, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private final class HeartRateManagerCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -149,5 +149,5 @@ public class HRManager extends BatteryManager { bodySensorLocationCharacteristic = null; heartRateCharacteristic = null; } - }; + } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java index 05c8d1c4..95831cb5 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java @@ -62,14 +62,14 @@ public class HTManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new HTManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc.. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class HTManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { super.initialize(); @@ -107,5 +107,5 @@ public class HTManager extends BatteryManager { super.onDeviceDisconnected(); htCharacteristic = null; } - }; + } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java index 06f05232..d44a7475 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java @@ -63,14 +63,14 @@ class ProximityManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new ProximityManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class ProximityManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -127,7 +127,7 @@ class ProximityManager extends BatteryManager { // Reset the alert flag alertOn = false; } - }; + } /** * Toggles the immediate alert on the target device. diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java index e270da33..16e51f83 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java @@ -78,14 +78,14 @@ public class TemplateManager extends BatteryManager { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new TemplateManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class TemplateManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -205,7 +205,7 @@ public class TemplateManager extends BatteryManager { }) .enqueue(); } - }; + } // TODO Define manager's API diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java index 7fe0e704..dcd3e54f 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java @@ -60,14 +60,14 @@ public class UARTManager extends LoggableBleManager { @NonNull @Override protected BleManagerGattCallback getGattCallback() { - return gattCallback; + return new UARTManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc. */ - private final BleManagerGattCallback gattCallback = new BleManagerGattCallback() { + private class UARTManagerGattCallback extends BleManagerGattCallback { @Override protected void initialize() { @@ -115,7 +115,7 @@ public class UARTManager extends LoggableBleManager { txCharacteristic = null; useLongWrite = true; } - }; + } // This has been moved to the service in BleManager v2.0. /*@Override