From 4316b3d22b3a5bd4baefcba891cb2c119e628412 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 20 Feb 2020 10:35:33 +0100
Subject: [PATCH 1/5] #89 fixed

---
 .../no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 caf5d72a..d6533bb9 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
@@ -118,7 +118,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
 			}
 			device.setCharacteristicNotification(recordAccessControlPointCharacteristic, true);
 			*/
-			setNotificationCallback(glucoseMeasurementContextCharacteristic)
+			setNotificationCallback(glucoseMeasurementCharacteristic)
 					.with(new GlucoseMeasurementDataCallback() {
 						@Override
 						public void onDataReceived(@NonNull final BluetoothDevice device, @NonNull final Data data) {
@@ -255,7 +255,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
 						}
 					});
 
-			enableNotifications(glucoseMeasurementContextCharacteristic).enqueue();
+			enableNotifications(glucoseMeasurementCharacteristic).enqueue();
 			enableNotifications(glucoseMeasurementContextCharacteristic).enqueue();
 			enableIndications(recordAccessControlPointCharacteristic)
 					.fail((device, status) -> log(Log.WARN, "Failed to enabled Record Access Control Point indications (error " + status + ")"))

From 130106778140a14f1b1b2100da568bbc72a23771 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 20 Feb 2020 10:36:11 +0100
Subject: [PATCH 2/5] Glucose: Abort button fixed (wrong style)

---
 app/src/main/res/layout-land/activity_feature_gls.xml | 4 +++-
 app/src/main/res/layout/activity_feature_gls.xml      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_feature_gls.xml b/app/src/main/res/layout-land/activity_feature_gls.xml
index d76a7c3b..49b36ff3 100644
--- a/app/src/main/res/layout-land/activity_feature_gls.xml
+++ b/app/src/main/res/layout-land/activity_feature_gls.xml
@@ -157,6 +157,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:gravity="center_horizontal"
+					tools:visibility="gone"
 					android:orientation="vertical">
 
 					<com.google.android.material.button.MaterialButton
@@ -191,11 +192,12 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:orientation="horizontal"
+					tools:visibility="visible"
 					android:visibility="gone">
 
 					<Button
+						style="@style/Widget.MaterialComponents.Button.TextButton"
 						android:id="@+id/action_abort"
-						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="0dp"
 						android:layout_height="wrap_content"
 						android:layout_weight="1"
diff --git a/app/src/main/res/layout/activity_feature_gls.xml b/app/src/main/res/layout/activity_feature_gls.xml
index 53fe9d1e..ccb32126 100644
--- a/app/src/main/res/layout/activity_feature_gls.xml
+++ b/app/src/main/res/layout/activity_feature_gls.xml
@@ -189,11 +189,12 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:orientation="horizontal"
+					tools:visibility="visible"
 					android:visibility="gone">
 
 					<Button
+						style="@style/Widget.MaterialComponents.Button.TextButton"
 						android:id="@+id/action_abort"
-						style="?android:attr/buttonBarButtonStyle"
 						android:layout_width="0dp"
 						android:layout_height="wrap_content"
 						android:layout_weight="1"

From c63948bd07d553a0c55245b0b2a5ad7a56fa8c66 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 20 Feb 2020 10:36:31 +0100
Subject: [PATCH 3/5] Glucose: minor improvements

---
 .../gls/ExpandableRecordAdapter.java          |  4 +--
 .../nrftoolbox/gls/GlucoseActivity.java       |  4 +--
 .../nrftoolbox/gls/GlucoseManager.java        | 33 +++++++++++++++----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/ExpandableRecordAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/ExpandableRecordAdapter.java
index 71595b86..6bc6cbad 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/ExpandableRecordAdapter.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/ExpandableRecordAdapter.java
@@ -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();
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java
index 043a0aa3..238f650e 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java
@@ -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;
 	}
 
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 d6533bb9..6ac2a3f9 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
@@ -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();

From f61500911faba5ed6242f0dbcd58e9e016228dd4 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 20 Feb 2020 10:37:42 +0100
Subject: [PATCH 4/5] Minify disabled in debug (allows debugging)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5be7dd13..f000ed9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
     }
     buildTypes {
         debug {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {

From 886cf8740b88c5513bf2d5dca2006b8883695908 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 20 Feb 2020 10:40:52 +0100
Subject: [PATCH 5/5] Version 2.8.4

---
 README.md         | 4 ++--
 app/build.gradle  | 4 ++--
 wear/build.gradle | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 34672bc7..d3b29963 100644
--- a/README.md
+++ b/README.md
@@ -227,5 +227,5 @@ contributed based on the [Apache 2.0 license](http://www.apache.org/licenses/LIC
 - Android 4.3 or newer is required.
 - Compatible with nRF5 devices running samples from the Nordic SDK and other devices implementing 
   standard profiles.
-- Development kits can be ordered from http://www.nordicsemi.com/eng/Buy-Online.
-- The nRF51 or nRF52 SDKs and SoftDevices are available online at http://developer.nordicsemi.com.
+- Development kits: https://www.nordicsemi.com/Software-and-tools/Development-Kits.
+- The nRF5 SDK and SoftDevices are available online at http://developer.nordicsemi.com.
diff --git a/app/build.gradle b/app/build.gradle
index f000ed9a..1cd83615 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 75
-        versionName "2.8.3"
+        versionCode 76
+        versionName "2.8.4"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true
diff --git a/wear/build.gradle b/wear/build.gradle
index 637450a4..fea21811 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 292827401 // target: 29, version: 2.8.2, build: 74, multi-APK: 01
-        versionName "2.8.2"
+        versionCode 292847601 // target: 29, version: 2.8.4, build: 74, multi-APK: 01
+        versionName "2.8.4"
         resConfigs "en"
     }
     lintOptions {