Populate Watch ID and WatchSD version from BLE data source

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="128"
-    android:versionName="4.2.1f">
+    android:versionName="4.2.1g">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java

@@ -23,6 +23,7 @@
 */
 package uk.org.openseizuredetector;
 
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
@@ -34,15 +35,19 @@ import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.format.Time;
 import android.util.Log;
 
+import androidx.core.app.ActivityCompat;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
@@ -262,15 +267,16 @@ public class SdDataSourceBLE extends SdDataSource {
                                 Log.v(TAG, "Subscribing to Acceleration Data Change Notifications");
                                 mOsdChar = gattCharacteristic;
                                 setCharacteristicNotification(gattCharacteristic, true);
-                            }
+                            } else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) {
-                            else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) {
                                 Log.v(TAG, "Subscribing to battery change Notifications");
                                 setCharacteristicNotification(gattCharacteristic, true);
+                            } else if (charUuidStr.equals(CHAR_OSD_WATCH_ID)) {
+                                Log.v(TAG, "Reading Watch ID");
+                                executeReadCharacteristic(gattCharacteristic);
+                            } else if (charUuidStr.equals(CHAR_OSD_WATCH_FW)) {
+                                Log.v(TAG, "Reading Watch Firmware Version");
+                                executeReadCharacteristic(gattCharacteristic);
                             }
-                            //else if (charUuidStr.equals(CHAR_OSD_HR_DATA)) {
-                            //    Log.v(TAG, "Subscribing to HR change Notifications");
-                            //    setCharacteristicNotification(gattCharacteristic,true);
-                            //.}
                         }
                     }
                 }
@@ -291,6 +297,46 @@ public class SdDataSourceBLE extends SdDataSource {
             }
         }
 
+
+        /**
+         * executeReadCharacteristic runs teh bluetoothGatt readCharacteristic command to read the value
+         * of a given characteristic.
+         * Because only one BLE operation can be taking place at a time, it may fail, in which case
+         * the read is re-tried after a 100ms delay.
+          * @param gattCharacteristic - the characteristic to be read.
+         */
+        private void executeReadCharacteristic(BluetoothGattCharacteristic gattCharacteristic) {
+            boolean retVal = mBluetoothGatt.readCharacteristic(gattCharacteristic);
+            if (retVal) {
+                Log.d(TAG,"executeReadCharacteristic - read initiated successfully");
+            } else {
+                Log.d(TAG,"executeReadCharacteristic - read initiation failed - waiting, then re-trying");
+                mHandler.postDelayed(new Runnable() {
+                    public void run() {
+                        Log.w(TAG, "Executing delayed read of characteristic");
+                        executeReadCharacteristic(gattCharacteristic);
+                    }
+                }, 100);
+            }
+        }
+        private boolean permissionsOK() {
+            if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                Log.e(TAG,"permissionsOK() - Bluetooth Permmission Not Granted");
+                mUtil.showToast("ERROR - Bluetooth Permission not Granted");
+                return (false);
+            } else {
+                return (true);
+            }
+
+        }
+
         public void onDataReceived(BluetoothGattCharacteristic characteristic) {
             /**
              * onDataReceived - called whenever a BLE characteristic notifies us that its data has changed.
@@ -349,6 +395,18 @@ public class SdDataSourceBLE extends SdDataSource {
                 Log.v(TAG,"onDataReceived(): CHAR_OSD_BATT_DATA: " + String.format("%d", batteryPc));
                 mSdData.haveSettings = true;
             }
+            else if (characteristic.getUuid().toString().equals(CHAR_OSD_WATCH_ID)) {
+                byte[] rawDataBytes = characteristic.getValue();
+                String watchId = new String(rawDataBytes, StandardCharsets.UTF_8);
+                Log.v(TAG,"Received Watch ID: "+watchId);
+                mSdData.watchSdName = watchId;
+            }
+            else if (characteristic.getUuid().toString().equals(CHAR_OSD_WATCH_FW)) {
+                byte[] rawDataBytes = characteristic.getValue();
+                String watchFwVer = new String(rawDataBytes, StandardCharsets.UTF_8);
+                Log.v(TAG,"Received Watch Firmware Version: "+watchFwVer);
+                mSdData.watchSdVersion = watchFwVer;
+            }
             else {
                 Log.v(TAG,"Unrecognised Characteristic Updated "+
                         characteristic.getUuid().toString());

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath 'com.google.gms:google-services:4.3.15'
     }
 }