Modified to compe with parameters sent by Garmin connectIQ makeWebRequest() function (and Merge branch 'V2.5' into V2.6)

CHANGELOG.md

@@ -5,10 +5,12 @@
 	Added Support for Wifi data source (initially to be used for ESP8266_SD)
 	and Android Wear datasource
 
+	V2.5.3 - 10sep2017 - Added Pebble App V2.6 which provides better alarm reliability
+	- no changes to Android App other than first run dialog.
+
 	V2.5.2 - 09 May 2017
 	Added support for Pebble App V2.5 which includes a multi-ROI mode to improve sensitivity.
-	
-	
+
     V2.5.1 - 07 May 2017
 	- Improved alarm annunciation for short duration seizures - setting
 	Latch Alarms will result in alarms sounding for at least Latch Alarm

app/build.gradle

@@ -7,8 +7,8 @@ android {
 
     defaultConfig {
         applicationId "uk.org.openseizuredetector"
-        minSdkVersion 20
-        targetSdkVersion 24
+        minSdkVersion 14
+        targetSdkVersion 14
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
-    android:versionCode="37"
+    android:versionCode="38"
     android:versionName="2.6.0">
+    android:versionName="2.5.3">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

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

@@ -275,7 +275,7 @@ public class MainActivity extends Activity {
         TextView tv;
         tv = (TextView) findViewById(R.id.versionTv);
         String versionName = mUtil.getAppVersionName();
-        tv.setText("OpenSeizureDetector Server Version " + versionName);
+        tv.setText("OpenSeizureDetector Android App Version " + versionName);
 
         mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server");
         mUtil.bindToServer(this, mConnection);

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

@@ -90,10 +90,10 @@ public class SdWebServer extends NanoHTTPD {
                         Log.v(TAG, "WebServer.serve() - POST /data - receiving data from device: parameters=" + parameters.toString());
                         Log.v(TAG, "              header=" + header.toString());
                         Log.v(TAG, "              files=" + files.toString());
-                        String postData = files.get("postData");
-                        Log.v(TAG, "              postData=" + postData);
+                        //String postData = files.get("postData");
+                        //Log.v(TAG, "              postData=" + postData);
                         // Send the data to the SdDataSource so the app can pick it up.
-                        mSdServer.mSdDataSource.updateFromJSON(postData);
+                        mSdServer.mSdDataSource.updateFromJSON(parameters.toString());
                         break;
                     default:
                         Log.v(TAG, "WebServer.serve() - Unrecognised method - " + method);