From cc58c0995a755011e46b84a5f599882cd4a87eb5 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Mon, 24 Oct 2022 22:33:48 +0100
Subject: [PATCH] Added notification of NDA logging to main app screen.

---
 .../uk/org/openseizuredetector/MainActivity.java    | 13 ++++++++++---
 .../java/uk/org/openseizuredetector/SdServer.java   |  2 +-
 app/src/main/res/xml/logging_prefs.xml              |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 1a55010..fec35b0 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -503,16 +503,23 @@ public class MainActivity extends AppCompatActivity {
             TextView tv;
             if (mUtil.isServerRunning()) {
                 tv = (TextView) findViewById(R.id.serverStatusTv);
-                if (mConnection.mBound)
+                if (mConnection.mBound) {
                     if (mConnection.mSdServer.mSdDataSourceName.equals("Phone")) {
-                        tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone"+"\n"+"(Demo Mode)");
+                        if (mConnection.mSdServer.mLogNDA)
+                            tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)"+"\nNDA Logging");
+                        else
+                            tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)");
                         tv.setBackgroundColor(warnColour);
                         tv.setTextColor(warnTextColour);
                     } else {
-                        tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName);
+                        if (mConnection.mSdServer.mLogNDA)
+                            tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName+"\nNDA Logging");
+                        else
+                            tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName);
                         tv.setBackgroundColor(okColour);
                         tv.setTextColor(okTextColour);
                     }
+                }
                 tv = (TextView) findViewById(R.id.serverIpTv);
                 tv.setText(getString(R.string.AccessServerAt) + " http://"
                         + mUtil.getLocalIpAddress()
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 7ffc503..06ee9cf 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -564,7 +564,6 @@ public class SdServer extends Service implements SdDataReceiver {
         SdData sdData = mSdData;
         sdData.alarmState = 5;
         onSdDataReceived(sdData);
-        mLm.updateSdData(sdData);  // Make sure the data time is up to date in the log manager - only relevant for NDA logging.
     }
 
     /**
@@ -769,6 +768,7 @@ public class SdServer extends Service implements SdDataReceiver {
 
         if (webServer != null) webServer.setSdData(mSdData);
         Log.v(TAG, "onSdDataReceived() - setting mSdData to " + mSdData.toString());
+        mLm.updateSdData(mSdData);
 
         logData();
     }
diff --git a/app/src/main/res/xml/logging_prefs.xml b/app/src/main/res/xml/logging_prefs.xml
index 4d23ed8..383e2d2 100644
--- a/app/src/main/res/xml/logging_prefs.xml
+++ b/app/src/main/res/xml/logging_prefs.xml
@@ -11,7 +11,7 @@
         android:summary="@string/log_data_summary"
         android:title="@string/log_data_title" /> -->
     <EditTextPreference
-        android:defaultValue="150"
+        android:defaultValue="180"
         android:key="EventDurationSec"
         android:summary="@string/eventDurationSummary"
         android:title="@string/eventDurationTitle" />