V3.1.13 - Fixed problem with network datasource not responding to FAULT conditions correctly

CHANGELOG.md

@@ -1,10 +1,10 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
 
-    V3.2.0 - (NEXT VERSION!)
+	V3.1.13 - 16feb2020
-        - Added neural network based data analysis.
+	    - Fixed problem with NetworkDataSource not responding to FAULT conditions properly.
 
-    V3.1.12 - 15feb2019
+    V3.1.12 - 15feb2020
         - Updated web server to return correct application/json mime type to get rid of -400
           errors on garmin watch.   Made error messages json strings too.
           Added hrAlarmStanding value to /data json string, which should get remove

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":66,"versionName":"3.1.12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":67,"versionName":"3.1.13","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

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"
     package="uk.org.openseizuredetector"
-    android:versionCode="66"
+    android:versionCode="67"
-    android:versionName="3.1.12"
+    android:versionName="3.1.13"
     >
     <!--android:allowBackup="false"-->
 

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

@@ -133,9 +133,10 @@ public class SdData implements Parcelable {
                 simpleSpec[i] = specArr.optInt(i);
             }
             haveData = true;
+            Log.v(TAG, "fromJSON(): sdData = " + this.toString());
             return true;
         } catch (Exception e) {
-            Log.v(TAG, "fromJSON() - error parsing result");
+            Log.v(TAG, "fromJSON() - error parsing result"+e.toString());
             haveData = false;
             return false;
         }

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

@@ -132,6 +132,7 @@ public class SdDataSourceNetwork extends SdDataSource {
                     sdData.alarmPhrase = "Warning - No Connection to Server";
                     Log.v(TAG,"doInBackground(): No Connection to Server - sdData = "+sdData.toString());
                 } else {
+                    Log.v(TAG,"doInBackground - result = "+result);
                     sdData.fromJSON(result);
                     // Populate mSdData using the received data.
                     sdData.serverOK = true;
@@ -200,9 +201,9 @@ public class SdDataSourceNetwork extends SdDataSource {
     // a string.
     private String downloadUrl(String myurl) throws IOException {
         InputStream is = null;
-        // Only display the first 500 characters of the retrieved
+        // Only retrieve the first 2048 characters of the retrieved
         // web page content.
-        int len = 500;
+        int len = 2048;
 
         try {
             URL url = new URL(myurl);
@@ -214,7 +215,7 @@ public class SdDataSourceNetwork extends SdDataSource {
             // Starts the query
             conn.connect();
             int response = conn.getResponseCode();
-            Log.d(TAG, "The response is: " + response);
+            Log.d(TAG, "downloadUrl(): The response is: " + response);
             is = conn.getInputStream();
 
             // Convert the InputStream into a string

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

@@ -644,11 +644,13 @@ public class SdServer extends Service implements SdDataReceiver {
         logData();
     }
 
+
     // Called by SdDataSource when a fault condition is detected.
     public void onSdDataFault(SdData sdData) {
         Log.v(TAG, "onSdDataFault()");
         mSdData = sdData;
         mSdData.alarmState = 4;  // set fault alarm state.
+        mSdData.alarmPhrase = "FAULT";
         mSdData.alarmStanding = false;
         if (webServer != null) webServer.setSdData(mSdData);
         if (mAudibleFaultWarning) {

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

@@ -408,6 +408,7 @@ public class StartupActivity extends Activity {
                             + "http://openseizuredetector.org.uk, or the app Facebook page at https://www.facebook.com/openseizuredetector. "
                             + "so I can get in touch if necessary.\nThank you!  Graham \ngraham@openseizuredetector.org.uk "
                             + "\n\nChanges in this version:"
+                            + "\n  V3.1.13 - Fixed ERR-400 display on garmin watch and associated problem with network datasource fault alerting."
                             + "\n  V3.1.11 - Fixed issue that Nework data source did not display heart rate data"
                             + "\n  V3.1.10 - Provided a user option to treat a null heart rate as a fault or an alarm condition"
                             + "\n  V3.1.9 - Fixed issue with Garmin Seizure Detector not producing warnings.  Added fault pips for missing heart rate data if heart rate alarm active"
@@ -440,6 +441,7 @@ public class StartupActivity extends Activity {
                             + "http://openseizuredetector.org.uk, or the app Facebook page at https://www.facebook.com/openseizuredetector. "
                             + "so I can get in touch if necessary.\nThank you!  Graham \ngraham@openseizuredetector.org.uk "
                             + "\n\nChanges in this version:"
+                            + "\n  V3.1.13 - Fixed ERR-400 display on garmin watch and associated problem with network datasource fault alerting."
                             + "\n  V3.1.11 - Fixed issue that Nework data source did not display heart rate data"
                             + "\n  V3.1.10 - Provided a user option to treat a null heart rate as a fault or an alarm condition"
                             + "\n  V3.1.9 - Fixed issue with Garmin Seizure Detector not producing warnings.  Added fault pips for missing heart rate data if heart rate alarm active"