From 951f6b176a0f8431264d42e94b9e60b9312519af Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Tue, 7 May 2024 21:15:35 +0100
Subject: [PATCH] Update version number and logcat strings to help with
 debugging

---
 CHANGELOG.md                                                | 1 +
 app/src/main/AndroidManifest.xml                            | 4 ++--
 .../java/uk/org/openseizuredetector/SdDataSourceBLE2.java   | 6 ++++--
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3355ff7..3c9b93f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
+    V4.2.8 - Fixed BLE2 data source to work with BangleJS2 watches
     V4.2.7 - BLE2 data source re-start fixed??
     V4.2.6 - Fixed problem with notifications in Android 13
            - Improved start-up checks for permissions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca2c088..b300399 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="140"
-    android:versionName="4.2.7">
+    android:versionCode="141"
+    android:versionName="4.2.8">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java
index a1f532f..17875f4 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java
@@ -265,14 +265,14 @@ public class SdDataSourceBLE2 extends SdDataSource {
                         mHrChar = gattCharacteristic;
                         peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true);
                     } else if (charUuidStr.equals(CHAR_OSD_ACC_DATA)) {
-                        Log.i(TAG, "Subscribing to Acceleration Data Change Notifications");
+                        Log.i(TAG, "Subscribing to OSD Acceleration Data Change Notifications");
                         peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true);
                         mOsdChar = gattCharacteristic;
                     } else if (charUuidStr.equals(CHAR_OSD_STATUS)) {
                         Log.i(TAG, "Found OSD Status Characteristic");
                         mStatusChar = gattCharacteristic;
                     } else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) {
-                        Log.i(TAG, "Subscribing to battery change Notifications");
+                        Log.i(TAG, "Subscribing to OSD battery change Notifications");
                         peripheral.readCharacteristic(service.getUuid(), gattCharacteristic.getUuid());
                         peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true);
                         mBattChar = gattCharacteristic;
@@ -360,6 +360,8 @@ public class SdDataSourceBLE2 extends SdDataSource {
             BluetoothBytesParser parser = new BluetoothBytesParser(value);
             String charUuidStr = characteristicUUID.toString();
 
+            Log.v(TAG,"onCharacteristicUpdate() - Characteristic "+charUuidStr+" updated");
+
             if (charUuidStr.equals(CHAR_HEART_RATE_MEASUREMENT)) {
                 Log.v(TAG, String.format("%s", "HR Measurement"));
                 // Parse the flags
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b4d5a8..e2ba239 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
         "\n
+        \nV4.2.8 - Fixed problem with BangleJS2 not working with new BLE2 data source
         \nV4.2.7 - Finally fixed BLE2 data source re-start after dropping connection?
         \nV4.2.6 - Fixed issues with Android 13 notifications and BLE data source shutdown.  Added support for V2.x of Garmin watch app, Added new BLE2 data source, signal strength and battery level graphs.
         \nV4.2.4 - Fault alarm rather than crash if bluetooth system crashes.