From c5735d68c8c6dc02eb58bb69ce5541e18482503d Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Sun, 21 Jan 2024 19:47:23 +0000
Subject: [PATCH] Set watch SD name and part no. for BLE data source

---
 app/src/main/AndroidManifest.xml                     |  2 +-
 .../uk/org/openseizuredetector/SdDataSourceBLE.java  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e86502a..45f43b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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.1m">
+    android:versionName="4.2.1n">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
index 1777cb9..daf10dc 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
@@ -124,9 +124,6 @@ public class SdDataSourceBLE extends SdDataSource {
                            SdDataReceiver sdDataReceiver) {
         super(context, handler, sdDataReceiver);
         mName = "BLE";
-        // Set default settings from XML files (mContext is set by super().
-        PreferenceManager.setDefaultValues(mContext,
-                R.xml.network_passive_datasource_prefs, true);
     }
 
 
@@ -135,8 +132,8 @@ public class SdDataSourceBLE extends SdDataSource {
      * make sure any changes to preferences are taken into account.
      */
     public void start() {
-        Log.i(TAG, "start()");
         super.start();
+        Log.i(TAG, "start() - mBleDeviceAddr="+mBleDeviceAddr);
         mUtil.writeToSysLogFile("SdDataSourceBLE.start() - mBleDeviceAddr=" + mBleDeviceAddr);
 
         if (mBleDeviceAddr == "" || mBleDeviceAddr == null) {
@@ -144,7 +141,14 @@ public class SdDataSourceBLE extends SdDataSource {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             mContext.startActivity(intent);
         }
+
+        // Note, these values are set in BleScanActivity and written to shared preferences, which
+        // ae read in SdDataSource.java
+        // FIXME:  Read the shared preferences in this class so SdDataSource does not need to know
+        // FIXME:   about BLE details.
         Log.i(TAG, "mBLEDevice is " + mBleDeviceName + ", Addr=" + mBleDeviceAddr);
+        mSdData.watchSdName = mBleDeviceName;
+        mSdData.watchPartNo = mBleDeviceAddr;
 
         bleConnect();