V3.1.6 - made the cancel audible button cancel SMS alarms as well as audible beeps

CHANGELOG.md

@@ -4,6 +4,9 @@
     V3.2.0 - (NEXT VERSION!)
         - Added neural network based data analysis.
 
+    V3.1.6 - 27apr2919
+        - Made the Cancel Audible button inhibit SMS alarms as well as audible beeps.
+
     V3.1.5 - 27apr2919
         - Fixed crash of MainActivity when server shutdown.
 

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="59"
+    android:versionCode="60"
-    android:versionName="3.1.5"
+    android:versionName="3.1.6"
     >
     <!--android:allowBackup="false"-->
 

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

@@ -547,8 +547,15 @@ public class SdServer extends Service implements SdDataReceiver {
                         > 60000) {
                     sendSMSAlarm();
                     mSMSTime = tnow;
+                } else {
+                    mUtil.showToast("SMS Alarm already sent - not re-sending");
+                    Log.v(TAG, "SMS Alarm already sent - not re-sending");
                 }
+            } else {
+                mUtil.showToast("mSMSAlarm is false - not sending");
+                Log.v(TAG, "mSMSAlarm is false - not sending");
             }
+
             startLatchTimer();
         }
         // Handle fall alarm
@@ -576,8 +583,15 @@ public class SdServer extends Service implements SdDataReceiver {
                         > 60000) {
                     sendSMSAlarm();
                     mSMSTime = tnow;
+                } else {
+                    mUtil.showToast("SMS Alarm already sent - not re-sending");
+                    Log.v(TAG, "SMS Alarm already sent - not re-sending");
                 }
+            } else {
+                mUtil.showToast("mSMSAlarm is false - not sending");
+                Log.v(TAG, "mSMSAlarm is false - not sending");
             }
+
         }
         // Handle heart rate alarm
         if ((sdData.mHRAlarmActive) && (sdData.mHRAlarmStanding)) {
@@ -603,7 +617,13 @@ public class SdServer extends Service implements SdDataReceiver {
                         > 60000) {
                     sendSMSAlarm();
                     mSMSTime = tnow;
+                } else {
+                    mUtil.showToast("SMS Alarm already sent - not re-sending");
+                    Log.v(TAG, "SMS Alarm already sent - not re-sending");
                 }
+            } else {
+                mUtil.showToast("mSMSAlarm is false - not sending");
+                Log.v(TAG, "mSMSAlarm is false - not sending");
             }
 
         }
@@ -733,16 +753,24 @@ public class SdServer extends Service implements SdDataReceiver {
     public void sendSMSAlarm() {
         AlertDialog ad;
         if (mSMSAlarm) {
-            if (!mUtil.areSMSPermissionsOK()) {
+            if (!mCancelAudible) {
-                mUtil.showToast("ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+                if (!mUtil.areSMSPermissionsOK()) {
-                Log.e(TAG,"ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+                    mUtil.showToast("ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+                    Log.e(TAG, "ERROR - Permission for SMS or Location Denied - Not Sending SMS");
+                } else {
+                    //mSMSAlertDialog = new AlertDialog.Builder(this);
+                    //mSMSAlertDialog.setMessage("SMS Will be Sent in 10 Seconds, unless you press the Cancel Button")
+                    //        .setPositiveButton("Send", smsCancelClickListener)
+                    //        .setNegativeButton("Cancel", smsCancelClickListener);
+                    //ad = mSMSAlertDialog.show();
+                    startSmsTimer();
+                }
             } else {
-                //mSMSAlertDialog = new AlertDialog.Builder(this);
+                Log.i(TAG, "sendSMSAlarm() - Cancel Audible Active - not sending SMS");
-                //mSMSAlertDialog.setMessage("SMS Will be Sent in 10 Seconds, unless you press the Cancel Button")
+                Toast toast = Toast.makeText(getApplicationContext(),
-                //        .setPositiveButton("Send", smsCancelClickListener)
+                        "Cancel Audible Active - not sending SMS",
-                //        .setNegativeButton("Cancel", smsCancelClickListener);
+                        Toast.LENGTH_SHORT);
-                //ad = mSMSAlertDialog.show();
+                toast.show();
-                startSmsTimer();
             }
         } else {
             Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");

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

@@ -504,6 +504,7 @@ public class StartupActivity extends Activity {
                             + "\n- V3.1.0 - Added fall detection algorithm into Garmin/Fitbit Data Source "
                             + "\n  V3.1.3 - Added delay to SMS sending to give the user chance to cancel a false alarm."
                             + "\n  V3.1.5 - Added repeat alarm beeps during SMS delay to alert user.."
+                            + "\n  V3.1.6 - Made Cancel Audible button inhibit sending SMS alarms as well as audible beeps"
                 );
             // This makes the links display as links, but they do not respond to clicks for some reason...
             Linkify.addLinks(s, Linkify.ALL);
@@ -536,6 +537,7 @@ public class StartupActivity extends Activity {
                             + "\n- V3.1.0 - Added fall detection algorithm into Garmin/Fitbit Data Source "
                             + "\n  V3.1.3 - Added delay to SMS sending to give the user chance to cancel a false alarm."
                             + "\n  V3.1.5 - Added repeat alarm beeps during SMS delay to alert user.."
+                            + "\n  V3.1.6 - Made Cancel Audible button inhibit sending SMS alarms as well as audible beeps"
                             + "\n "
             );
             // This makes the links display as links, but they do not respond to clicks for some reason...