V4.0.4 - Added data source name to event data, tidied upgrade changelog text.

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
     android:versionCode="100"
-    android:versionName="4.0.4b">
+    android:versionName="4.0.4">
     <!-- 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/SdData.java

@@ -72,6 +72,7 @@ public class SdData implements Parcelable {
     public double mO2SatThreshMin = 80.0;
 
     /* Watch App Settings */
+    public String dataSourceName = "";
     public String watchPartNo = "";
     public String watchFwVersion = "";
     public String watchSdVersion = "";
@@ -242,6 +243,7 @@ public class SdData implements Parcelable {
             jsonObj.put("o2SatAlarmActive", mO2SatAlarmActive);
             jsonObj.put("o2SatAlarmStanding", mO2SatAlarmStanding);
             jsonObj.put("o2SatThreshMin", mO2SatThreshMin);
+            jsonObj.put("dataSourceName", dataSourceName);
             jsonObj.put("watchPartNo", watchPartNo);
             jsonObj.put("watchSdName", watchSdName);
             jsonObj.put("watchFwVersion", watchFwVersion);

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

@@ -228,6 +228,7 @@ public class SdServer extends Service implements SdDataReceiver {
         updatePrefs();
 
         Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName);
+        mSdData.dataSourceName = mSdDataSourceName;
         switch (mSdDataSourceName) {
             case "Pebble":
                 Log.v(TAG, "Selecting Pebble DataSource");

app/src/main/res/values/strings.xml

@@ -3,11 +3,7 @@
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
         "\n
-        \nV4.0.4 - Added watch info to events data
-        \nV4.0.3 - Changed remote database to be compatible with either OSD webAPI or future Firebase database.<br/>
-           - Performance improvement by having separate events and datapoints tables in local database
-        \nV4.0.1, 4.0.2, - fixed repoted crashes
-        \nV4.0.0
+        \nV4.0.4
           - Introduced the &lt;b>Data Sharing&lt;/b> feature to allow users to share their seizure and false alarm data
         with researchers to help improve the system.&lt;br/>
           - Fixed &lt;b>SMS Location Alerts&lt;/b> on Android V10+ (new permissions screens)&lt;br/>