Upate to V2.5.5 beta - Corrected some network logging messages, and made NetworkDataSource use the timeout settings in the preferences screen (it used to ignore them!)

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40},"path":"app-release.apk","properties":{"packageId":"uk.org.openseizuredetector","split":"","minSdkVersion":"14"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41},"path":"app-release.apk","properties":{"packageId":"uk.org.openseizuredetector","split":"","minSdkVersion":"14"}}]

app/src/main/AndroidManifest.xml

@@ -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="40"
+    android:versionCode="41"
     android:versionName="2.5.5">
 
     <uses-permission android:name="android.permission.INTERNET" />

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

@@ -28,6 +28,8 @@ public class SdDataSourceNetwork extends SdDataSource {
     private Time mStatusTime;
     private Timer mDataUpdateTimer;
     private int mDataUpdatePeriod = 2000;
+    private int mConnnectTimeoutPeriod = 5000;
+    private int mReadTimeoutPeriod = 5000;
     private String mServerIP = "unknown";
 
     private int ALARM_STATE_NETFAULT = 7;
@@ -92,6 +94,12 @@ public class SdDataSourceNetwork extends SdDataSource {
             String dataUpdatePeriodStr = SP.getString("DataUpdatePeriod","2000");
             mDataUpdatePeriod = Integer.parseInt(dataUpdatePeriodStr);
             Log.v(TAG,"updatePrefs() - mDataUpdatePeriod = "+mDataUpdatePeriod);
+            String connectTimeoutPeriodStr = SP.getString("ConnectTimeoutPeriod","5000");
+            mConnnectTimeoutPeriod = Integer.parseInt(connectTimeoutPeriodStr);
+            Log.v(TAG,"updatePrefs() - mConnectTimeoutPeriod = "+mConnnectTimeoutPeriod);
+            String readTimeoutPeriodStr = SP.getString("ReadTimeoutPeriod","5000");
+            mReadTimeoutPeriod = Integer.parseInt(readTimeoutPeriodStr);
+            Log.v(TAG,"updatePrefs() - mReadTimeoutPeriod = "+mReadTimeoutPeriod);
         } catch (Exception ex) {
             Log.v(TAG,"updatePrefs() - Problem parsing preferences!");
             mUtil.writeToSysLogFile("SdDataSourceNetwork().updatePrefs() - " +ex.toString());
@@ -156,9 +164,7 @@ public class SdDataSourceNetwork extends SdDataSource {
     }
 
     /**
-     * Retrive the current Seizure Detector Data from the server.
+     * Accept an alarm remotely using a http GET request.
-     * Uses the DownloadSdDataTask class to download the data in the
-     * background.  The data is processed in DownloadSdDataTask.onPostExecute().
      */
     @Override
     public void acceptAlarm() {
@@ -203,8 +209,8 @@ public class SdDataSourceNetwork extends SdDataSource {
         try {
             URL url = new URL(myurl);
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setReadTimeout(5000 /* milliseconds */);
+            conn.setReadTimeout(mReadTimeoutPeriod /* milliseconds */);
-            conn.setConnectTimeout(5000 /* milliseconds */);
+            conn.setConnectTimeout(mConnnectTimeoutPeriod /* milliseconds */);
             conn.setRequestMethod("GET");
             conn.setDoInput(true);
             // Starts the query

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

@@ -570,6 +570,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
         } else {
             startFaultTimer();
             Log.v(TAG, "faultWarningBeep() - starting Fault Timer");
+            mUtil.writeToSysLogFile("faultWarningBeep() - starting Fault Timer");
         }
 
     }
@@ -844,7 +845,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
         @Override
         public void onReceive(Context context, Intent intent) {
             Log.v(TAG, "NetworkBroadCastReceiver.onReceive");
-            mUtil.writeToSysLogFile("Network State Changed" + intent.getAction());
+            //mUtil.writeToSysLogFile("Network State Changed" + intent.getAction());
             //mUtil.showToast("Network State Changed" + intent.getAction());
 
             ConnectivityManager cm =
@@ -858,9 +859,9 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
                 mUtil.writeToSysLogFile("NetworkBroadcastReceiver - failed to retrieve active network info");
                 Log.v(TAG, e.toString());
             }
-            if (activeNetwork != null) {
             boolean isConnected = activeNetwork != null &&
                     activeNetwork.isConnectedOrConnecting();
+            if (isConnected) {
                 boolean isWiFi = activeNetwork.getType() == ConnectivityManager.TYPE_WIFI;
                 if (!isWiFi) {
                     Log.v(TAG, "NetworkBroadcastReceiver - no Wifi Connection");
@@ -871,7 +872,6 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
                     mUtil.writeToSysLogFile("Network State Changed - Wifi Connected");
                     mUtil.showToast("Network State Changed - Wifi Connected");
                 }
-
             } else {
                 Log.v(TAG, "NetworkBroadcastReceiver - No Active Network");
                 mUtil.writeToSysLogFile("Network State Changed - No Active Network");
@@ -1065,8 +1065,10 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
     public void startFaultTimer() {
         if (mFaultTimer != null) {
             Log.v(TAG, "startFaultTimer(): fault timer already running - not doing anything.");
+            mUtil.writeToSysLogFile("startFaultTimer() - fault timer already running");
         } else {
             Log.v(TAG, "startFaultTimer(): starting fault timer.");
+            mUtil.writeToSysLogFile("startFaultTimer() - starting fault timer");
             runOnUiThread(new Runnable() {
                 public void run() {
                     mFaultTimerCompleted = false;
@@ -1082,11 +1084,13 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
     public void stopFaultTimer() {
         if (mFaultTimer != null) {
             Log.v(TAG, "stopFaultTimer(): fault timer already running - cancelling it.");
+            mUtil.writeToSysLogFile("stopFaultTimer() - stopping fault timer");
             mFaultTimer.cancel();
             mFaultTimer = null;
             mFaultTimerCompleted = false;
         } else {
             Log.v(TAG, "stopFaultTimer(): fault timer not running - not doing anything.");
+            //mUtil.writeToSysLogFile("stopFaultTimer() - fault timer not running");
         }
     }
 

app/src/main/res/xml/network_datasource_prefs.xml

@@ -12,15 +12,15 @@
         android:summary="Period between server data requests in miliseconds."
         android:title="Data Update Period (ms)" />
     <EditTextPreference
-        android:defaultValue="2000"
+        android:defaultValue="5000"
-        android:key="ConnTimeout"
+        android:key="ConnectTimeoutPeriod"
         android:numeric="integer"
         android:summary=""
-        android:title="Connection Timeout (ms)" />
+        android:title="Connection Timeout Period (ms)" />
     <EditTextPreference
-        android:defaultValue="2000"
+        android:defaultValue="5000"
-        android:key="SoTimeout"
+        android:key="ReadTimeoutPeriod"
         android:numeric="integer"
         android:summary=""
-        android:title="So Timeout (ms)" />
+        android:title="Read Timeout Period (ms)" />
 </PreferenceScreen>