V2.0.3 - fixed issue with crash during app re-start if warning beep sounding. And added logging of faults to alarm log on sd card.

CHANGELOG.md

@@ -1,7 +1,17 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
 
-	V2.0 - January 2015
+	V2.0.3 - 23 April 2016
+		Further modification to beep code to avoid occasional crashes
+		if system tries to beep during a re-start.
+		Log faults to alarm log on SD Card.
+	V2.0.2 - 13 April 2016
+		Modified 'beep' code to try to avoid crashes on some systems.
+
+	V2.0.1 - 02 April 2016
+		Fixed issue with fault alarms not sounding if watch disconnects from phone.
+	
+	V2.0 - 30 March 2016
 	Behind the Scenes
 	- Merged the server and client apps so only one app is needed to remove code duplication.
 	- Major rewrite of background service back-end to handle different data sources - either pebble or network so it can act as either server or client.
@@ -18,3 +28,5 @@
 	- Added ability to latch alarms so they have to be actively accepted to silence the alarm, rather than it re-setting when the movement stops.
 	- Fixed problem with the system being difficult to shut down if as multiple instances of main screen could be active at once.
 
+
+	

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.org.openseizuredetector"
-    android:versionCode="22"
-    android:versionName="2.0.2" >
+    android:versionCode="24"
+    android:versionName="2.0.3" >
 
     <uses-sdk android:minSdkVersion="14" />
 

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

@@ -292,6 +292,7 @@ public class SdServer extends Service implements SdDataReceiver {
         }
 
         mToneGenerator.release();
+        mToneGenerator = null;
     }
 
 
@@ -451,6 +452,7 @@ public class SdServer extends Service implements SdDataReceiver {
         // Fault
         if ((sdData.alarmState) == 4 || (sdData.alarmState == 7)) {
             sdData.alarmPhrase = "FAULT";
+            writeAlarmToSD();
             faultWarningBeep();
         } else {
             stopFaultTimer();
@@ -477,8 +479,13 @@ public class SdServer extends Service implements SdDataReceiver {
      * beep for duration milliseconds, but only if mAudibleAlarm is set.
      */
     private void beep(int duration) {
-        mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
-        Log.v(TAG, "beep()");
+        if (mToneGenerator!=null) {
+            mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
+            Log.v(TAG, "beep()");
+        } else {
+            mUtil.showToast("Warming mToneGenerator is null - not beeping!!!");
+            Log.v(TAG, "beep() - Warming mToneGenerator is null - not beeping!!!");
+        }
     }
 
     /*

local.properties

@@ -7,6 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Nov 09 19:12:29 GMT 2015
-ndk.dir=/usr/local/android-sdk-linux/ndk-bundle
-sdk.dir=/usr/local/android-sdk-linux
+#Sat Apr 23 18:39:21 BST 2016
+sdk.dir=/home/graham/Android/Sdk