gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'V3.0' of https://github.com/OpenSeizureDetector/Android_Pebble_SD into V3.0

Browse Source
This commit is contained in:
Graham Jones
2019-02-15 20:17:07 +00:00
parent ae39c9edcf 0638354ed6
commit 0d9b19200b
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-3.0.0.apk
View File

Binary file not shown.

2
app/release/output.json
View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":48,"versionName":"3.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":49,"versionName":"3.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

2
app/src/main/AndroidManifest.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="48"
android:versionCode="49"
android:versionName="3.0.0"
>
<!--android:allowBackup="false"-->

2
app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
View File

@@ -93,7 +93,7 @@ public class SdWebServer extends NanoHTTPD {
String postData = files.get("postData");
Log.v(TAG, " postData=" + postData);
// Send the data to the SdDataSource so the app can pick it up.
if (parameters != null) {
if (parameters.get("dataObj") != null) {
Log.v(TAG,"passing parameters to data source");
answer = mSdServer.mSdDataSource.updateFromJSON(parameters.get("dataObj").toString());
} else {