Modified to compe with parameters sent by Garmin connectIQ makeWebRequest() function (and Merge branch 'V2.5' into V2.6)
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user