diff --git a/CHANGELOG.md b/CHANGELOG.md index fa377f2..9f3d359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ OpenSeizureDetector Android App - Change Log ============================================ - V3.2.0 - (NEXT VERSION!) - - Added neural network based data analysis. + V3.1.13 - 16feb2020 + - 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 diff --git a/app/release/app-release-3.1.13.apk b/app/release/app-release-3.1.13.apk new file mode 100644 index 0000000..039dcb0 Binary files /dev/null and b/app/release/app-release-3.1.13.apk differ diff --git a/app/release/app-release-2.0.1.apk b/app/release/old_versions/app-release-2.0.1.apk similarity index 100% rename from app/release/app-release-2.0.1.apk rename to app/release/old_versions/app-release-2.0.1.apk diff --git a/app/release/app-release-2.0.2.apk b/app/release/old_versions/app-release-2.0.2.apk similarity index 100% rename from app/release/app-release-2.0.2.apk rename to app/release/old_versions/app-release-2.0.2.apk diff --git a/app/release/app-release-2.0.3.apk b/app/release/old_versions/app-release-2.0.3.apk similarity index 100% rename from app/release/app-release-2.0.3.apk rename to app/release/old_versions/app-release-2.0.3.apk diff --git a/app/release/app-release-2.0.4.apk b/app/release/old_versions/app-release-2.0.4.apk similarity index 100% rename from app/release/app-release-2.0.4.apk rename to app/release/old_versions/app-release-2.0.4.apk diff --git a/app/release/app-release-2.0.6.apk b/app/release/old_versions/app-release-2.0.6.apk similarity index 100% rename from app/release/app-release-2.0.6.apk rename to app/release/old_versions/app-release-2.0.6.apk diff --git a/app/release/app-release-2.0.7.apk b/app/release/old_versions/app-release-2.0.7.apk similarity index 100% rename from app/release/app-release-2.0.7.apk rename to app/release/old_versions/app-release-2.0.7.apk diff --git a/app/release/app-release-2.0.8.apk b/app/release/old_versions/app-release-2.0.8.apk similarity index 100% rename from app/release/app-release-2.0.8.apk rename to app/release/old_versions/app-release-2.0.8.apk diff --git a/app/release/app-release-2.0.apk b/app/release/old_versions/app-release-2.0.apk similarity index 100% rename from app/release/app-release-2.0.apk rename to app/release/old_versions/app-release-2.0.apk diff --git a/app/release/app-release-2.0b.apk b/app/release/old_versions/app-release-2.0b.apk similarity index 100% rename from app/release/app-release-2.0b.apk rename to app/release/old_versions/app-release-2.0b.apk diff --git a/app/release/app-release-2.0c.apk b/app/release/old_versions/app-release-2.0c.apk similarity index 100% rename from app/release/app-release-2.0c.apk rename to app/release/old_versions/app-release-2.0c.apk diff --git a/app/release/app-release-2.0d.apk b/app/release/old_versions/app-release-2.0d.apk similarity index 100% rename from app/release/app-release-2.0d.apk rename to app/release/old_versions/app-release-2.0d.apk diff --git a/app/release/app-release-2.3.0.apk b/app/release/old_versions/app-release-2.3.0.apk similarity index 100% rename from app/release/app-release-2.3.0.apk rename to app/release/old_versions/app-release-2.3.0.apk diff --git a/app/release/app-release-2.3.1.apk b/app/release/old_versions/app-release-2.3.1.apk similarity index 100% rename from app/release/app-release-2.3.1.apk rename to app/release/old_versions/app-release-2.3.1.apk diff --git a/app/release/app-release-2.3.2.apk b/app/release/old_versions/app-release-2.3.2.apk similarity index 100% rename from app/release/app-release-2.3.2.apk rename to app/release/old_versions/app-release-2.3.2.apk diff --git a/app/release/app-release-2.5.1.apk b/app/release/old_versions/app-release-2.5.1.apk similarity index 100% rename from app/release/app-release-2.5.1.apk rename to app/release/old_versions/app-release-2.5.1.apk diff --git a/app/release/app-release-2.5.2.apk b/app/release/old_versions/app-release-2.5.2.apk similarity index 100% rename from app/release/app-release-2.5.2.apk rename to app/release/old_versions/app-release-2.5.2.apk diff --git a/app/release/app-release-2.5.3.apk b/app/release/old_versions/app-release-2.5.3.apk similarity index 100% rename from app/release/app-release-2.5.3.apk rename to app/release/old_versions/app-release-2.5.3.apk diff --git a/app/release/app-release-2.5.4.apk b/app/release/old_versions/app-release-2.5.4.apk similarity index 100% rename from app/release/app-release-2.5.4.apk rename to app/release/old_versions/app-release-2.5.4.apk diff --git a/app/release/app-release-2.5.5.apk b/app/release/old_versions/app-release-2.5.5.apk similarity index 100% rename from app/release/app-release-2.5.5.apk rename to app/release/old_versions/app-release-2.5.5.apk diff --git a/app/release/app-release-2.6.0.apk b/app/release/old_versions/app-release-2.6.0.apk similarity index 100% rename from app/release/app-release-2.6.0.apk rename to app/release/old_versions/app-release-2.6.0.apk diff --git a/app/release/app-release-2.6.1.apk b/app/release/old_versions/app-release-2.6.1.apk similarity index 100% rename from app/release/app-release-2.6.1.apk rename to app/release/old_versions/app-release-2.6.1.apk diff --git a/app/release/app-release-2.6.2.apk b/app/release/old_versions/app-release-2.6.2.apk similarity index 100% rename from app/release/app-release-2.6.2.apk rename to app/release/old_versions/app-release-2.6.2.apk diff --git a/app/release/app-release-2.6.3.apk b/app/release/old_versions/app-release-2.6.3.apk similarity index 100% rename from app/release/app-release-2.6.3.apk rename to app/release/old_versions/app-release-2.6.3.apk diff --git a/app/release/app-release-2.6.4.apk b/app/release/old_versions/app-release-2.6.4.apk similarity index 100% rename from app/release/app-release-2.6.4.apk rename to app/release/old_versions/app-release-2.6.4.apk diff --git a/app/release/app-release-3.0.0.apk b/app/release/old_versions/app-release-3.0.0.apk similarity index 100% rename from app/release/app-release-3.0.0.apk rename to app/release/old_versions/app-release-3.0.0.apk diff --git a/app/release/app-release-3.0.1.apk b/app/release/old_versions/app-release-3.0.1.apk similarity index 100% rename from app/release/app-release-3.0.1.apk rename to app/release/old_versions/app-release-3.0.1.apk diff --git a/app/release/app-release-3.0.2.apk b/app/release/old_versions/app-release-3.0.2.apk similarity index 100% rename from app/release/app-release-3.0.2.apk rename to app/release/old_versions/app-release-3.0.2.apk diff --git a/app/release/app-release-3.0.3.apk b/app/release/old_versions/app-release-3.0.3.apk similarity index 100% rename from app/release/app-release-3.0.3.apk rename to app/release/old_versions/app-release-3.0.3.apk diff --git a/app/release/app-release-3.0.4.apk b/app/release/old_versions/app-release-3.0.4.apk similarity index 100% rename from app/release/app-release-3.0.4.apk rename to app/release/old_versions/app-release-3.0.4.apk diff --git a/app/release/app-release-3.1.0.apk b/app/release/old_versions/app-release-3.1.0.apk similarity index 100% rename from app/release/app-release-3.1.0.apk rename to app/release/old_versions/app-release-3.1.0.apk diff --git a/app/release/app-release-3.1.1.apk b/app/release/old_versions/app-release-3.1.1.apk similarity index 100% rename from app/release/app-release-3.1.1.apk rename to app/release/old_versions/app-release-3.1.1.apk diff --git a/app/release/app-release-3.1.10.apk b/app/release/old_versions/app-release-3.1.10.apk similarity index 100% rename from app/release/app-release-3.1.10.apk rename to app/release/old_versions/app-release-3.1.10.apk diff --git a/app/release/app-release-3.1.2.apk b/app/release/old_versions/app-release-3.1.2.apk similarity index 100% rename from app/release/app-release-3.1.2.apk rename to app/release/old_versions/app-release-3.1.2.apk diff --git a/app/release/app-release-3.1.3.apk b/app/release/old_versions/app-release-3.1.3.apk similarity index 100% rename from app/release/app-release-3.1.3.apk rename to app/release/old_versions/app-release-3.1.3.apk diff --git a/app/release/app-release-3.1.4.apk b/app/release/old_versions/app-release-3.1.4.apk similarity index 100% rename from app/release/app-release-3.1.4.apk rename to app/release/old_versions/app-release-3.1.4.apk diff --git a/app/release/app-release-3.1.5.apk b/app/release/old_versions/app-release-3.1.5.apk similarity index 100% rename from app/release/app-release-3.1.5.apk rename to app/release/old_versions/app-release-3.1.5.apk diff --git a/app/release/app-release-3.1.6.apk b/app/release/old_versions/app-release-3.1.6.apk similarity index 100% rename from app/release/app-release-3.1.6.apk rename to app/release/old_versions/app-release-3.1.6.apk diff --git a/app/release/app-release-3.1.7.apk b/app/release/old_versions/app-release-3.1.7.apk similarity index 100% rename from app/release/app-release-3.1.7.apk rename to app/release/old_versions/app-release-3.1.7.apk diff --git a/app/release/app-release-3.1.8.apk b/app/release/old_versions/app-release-3.1.8.apk similarity index 100% rename from app/release/app-release-3.1.8.apk rename to app/release/old_versions/app-release-3.1.8.apk diff --git a/app/release/app-release-3.1.9a.apk b/app/release/old_versions/app-release-3.1.9a.apk similarity index 100% rename from app/release/app-release-3.1.9a.apk rename to app/release/old_versions/app-release-3.1.9a.apk diff --git a/app/release/output.json b/app/release/output.json index 9dcd1d6..2e87807 100644 --- a/app/release/output.json +++ b/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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3e816d9..401044d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/app/src/main/java/uk/org/openseizuredetector/SdData.java b/app/src/main/java/uk/org/openseizuredetector/SdData.java index 8f4ad75..0c9dedc 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdData.java +++ b/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; } diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java index 99fbf25..118258e 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java +++ b/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 diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java index 385e922..0e853e2 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java +++ b/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) { diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java index cb3dca4..3862231 100644 --- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java +++ b/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"