diff --git a/app/release/app-release-4.1.3a.apk b/app/release/app-release-4.1.3a.apk new file mode 100644 index 0000000..c03b04a Binary files /dev/null and b/app/release/app-release-4.1.3a.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e18ddf..a1c1606 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="uk.org.openseizuredetector" android:versionCode="115" - android:versionName="4.1.3"> + android:versionName="4.1.3a"> diff --git a/app/src/main/java/uk/org/openseizuredetector/SdData.java b/app/src/main/java/uk/org/openseizuredetector/SdData.java index 6eae730..cd423d6 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdData.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdData.java @@ -123,7 +123,7 @@ public class SdData implements Parcelable { /* * Intialise this SdData object from a JSON String - * FIXME - add O2saturation with checking in case it is not included in the data + * */ public boolean fromJSON(String jsonStr) { Log.v(TAG, "fromJSON() - parsing jsonString - " + jsonStr); @@ -161,6 +161,13 @@ public class SdData implements Parcelable { for (int i = 0; i < specArr.length(); i++) { simpleSpec[i] = specArr.optInt(i); } + + try { + mO2Sat = jo.optDouble("o2Sat"); + } catch (Exception e) { + Log.w(TAG,"Error parsing o2Sat value"); + mO2Sat = -1; + } haveData = true; Log.v(TAG, "fromJSON(): sdData = " + this.toString()); return true; diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 136782c..ac3106b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -294,4 +294,5 @@ Okres (w dniach), przez który dane będą przechowywane i chronione przed usunięciem przez funkcję \'Automatyczne Czyszczenie Bazy Danych\'. Zapisuj Normalne Dzienne Aktywności (NDA) Cały czas rejestruj dane w systemie udostępniania danych, aby dostarczać w tle dane dotyczące \'NDA\', w celu zmniejszenia liczby fałszywych alarmów. + Anuluj diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb0b304..7a654f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ OpenSeizureDetector "\n + \nV4.1.3 - Fixed display of O2 Saturation in Network Data Source, and added Polish Translations by Jacek Błoniarz-Łuczak \nV4.1.2 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24) and 'Normal Daily Activity (NDA) logging function \nV4.0.7 - Improvements to Data Sharing data log manager screen. - Introduced the <b>Data Sharing</b> feature to allow users to share their seizure and false alarm data