From a79e98c4de0a675cbeb5311d98ae881402c3ed3b Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Tue, 5 Sep 2017 05:39:36 +0100 Subject: [PATCH] Extended SdDataSource to include an update data function that the web server can call --- .../main/java/uk/org/openseizuredetector/SdDataSource.java | 7 +++++++ .../main/java/uk/org/openseizuredetector/SdWebServer.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java index 42312fa..f424082 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java @@ -87,6 +87,13 @@ public abstract class SdDataSource { public void acceptAlarm() { Log.v(TAG,"acceptAlarm()"); } + + // Force the data stored in this datasource to update in line with the JSON string encoded data provided. + // Used by webServer to update the NetworkPassiveDatasource + public void updateFromJSON(String jsonStr) { + Log.v(TAG,"updateFromJSON - "+jsonStr); + } + /** * Display a Toast message on screen. * @param msg - message to display. diff --git a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java index 8a9e4dd..43441d5 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java @@ -92,6 +92,8 @@ public class SdWebServer extends NanoHTTPD { Log.v(TAG, " files=" + files.toString()); 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); break; default: Log.v(TAG, "WebServer.serve() - Unrecognised method - " + method);