gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Graham Jones
2019-04-27 21:23:20 +01:00
parent b33b0015bf
commit 6c31fa8aea
5 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

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

46
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -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()) {
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");
if (!mCancelAudible) {
if (!mUtil.areSMSPermissionsOK()) {
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);
//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();
Log.i(TAG, "sendSMSAlarm() - Cancel Audible Active - not sending SMS");
Toast toast = Toast.makeText(getApplicationContext(),
"Cancel Audible Active - not sending SMS",
Toast.LENGTH_SHORT);
toast.show();
}
} else {
Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");

2
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -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...