caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

KeepAliveReceiver: sanitize pump disconnected/missed readings alarms.

Browse source 
* Don't raise alarm on application start
* Re-raise alert only every ~30 min, not every 5 min.
This commit is contained in:
Johannes Mockenhaupt 2017-10-30 01:57:27 +01:00
parent 598d7f8de0
commit bdc61765ce
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
View file

@ -31,6 +31,9 @@ import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
public class KeepAliveReceiver extends BroadcastReceiver { public class KeepAliveReceiver extends BroadcastReceiver {
private static Logger log = LoggerFactory.getLogger(KeepAliveReceiver.class); private static Logger log = LoggerFactory.getLogger(KeepAliveReceiver.class);
private long nextPumpDisconnectedAlarm = System.currentTimeMillis() + 24 * 60 * 1000;
private long nextMissedReadingsAlarm = System.currentTimeMillis() + 24 * 60 * 1000;
@Override @Override
public void onReceive(Context context, Intent rIntent) { public void onReceive(Context context, Intent rIntent) {
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
@ -46,9 +49,11 @@ public class KeepAliveReceiver extends BroadcastReceiver {
private void checkBg() { private void checkBg() {
BgReading bgReading = DatabaseHelper.lastBg(); BgReading bgReading = DatabaseHelper.lastBg();
if (bgReading != null && bgReading.date + 25 * 60 * 1000 < System.currentTimeMillis()) { if (bgReading != null && bgReading.date + 25 * 60 * 1000 < System.currentTimeMillis()
Notification n = new Notification(Notification.BG_READINGS_MISSED, "Missed BG readings", Notification.URGENT); && nextMissedReadingsAlarm < System.currentTimeMillis()) {
Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
n.soundId = R.raw.alarm; n.soundId = R.raw.alarm;
nextMissedReadingsAlarm = System.currentTimeMillis() + 24 * 60 * 1000;
MainApp.bus().post(new EventNewNotification(n)); MainApp.bus().post(new EventNewNotification(n));
} }
} }
@ -56,25 +61,18 @@ public class KeepAliveReceiver extends BroadcastReceiver {
private void checkPump() { private void checkPump() {
final PumpInterface pump = MainApp.getConfigBuilder(); final PumpInterface pump = MainApp.getConfigBuilder();
final Profile profile = MainApp.getConfigBuilder().getProfile(); final Profile profile = MainApp.getConfigBuilder().getProfile();
if (pump != null && /* TODO does this prevent the error in case the pump is never initialized because it was never reachable? */ if (pump != null && profile != null && profile.getBasal() != null) {
// pump.isInitialized() &&
profile != null && profile.getBasal() != null) {
Date lastConnection = pump.lastDataTime(); Date lastConnection = pump.lastDataTime();
boolean isStatusOutdated = lastConnection.getTime() + 15 * 60 * 1000L < System.currentTimeMillis(); boolean isStatusOutdated = lastConnection.getTime() + 15 * 60 * 1000L < System.currentTimeMillis();
boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep; boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
// TODO triggers on init already; don't (both missed readings and pump comms)
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext()); SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
if (isStatusOutdated && lastConnection.getTime() + 25 * 60 * 1000 < System.currentTimeMillis()) { if (isStatusOutdated && lastConnection.getTime() + 25 * 60 * 1000 < System.currentTimeMillis()
// TODO the alarm will trigger every 5m until the problem is resolved. That can get annoying quiet quickly if && nextPumpDisconnectedAlarm < System.currentTimeMillis()) {
// fixing the problem takes longer (or is not immediately possible because the pump was forgotten)? Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
// suppress this for another 25m if the message was dismissed?
// The alarm sound is played back as regular media, that means it might be muted if sound level is at 0
// a simple 'Enable/disable alarms' button on the actions tab?
Notification n = new Notification(Notification.PUMP_UNREACHABLE,
MainApp.sResources.getString(R.string.combo_pump_state_disconnected), Notification.URGENT);
n.soundId = R.raw.alarm; n.soundId = R.raw.alarm;
nextPumpDisconnectedAlarm = System.currentTimeMillis() + 24 * 60 * 1000;
MainApp.bus().post(new EventNewNotification(n)); MainApp.bus().post(new EventNewNotification(n));
} else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) { } else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
Thread t = new Thread(new Runnable() { Thread t = new Thread(new Runnable() {

2
app/src/main/res/values/strings.xml
View file

@ -775,5 +775,7 @@
<string name="combo_action_setting_tbr">Setting TBR</string> <string name="combo_action_setting_tbr">Setting TBR</string>
<string name="combo_action_bolusing">Bolusing</string> <string name="combo_action_bolusing">Bolusing</string>
<string name="combo_action_idle">Idle</string> <string name="combo_action_idle">Idle</string>
<string name="pump_unreachable">Pump unreachable</string>
<string name="missed_bg_readings">Missed BG readings</string>
</resources> </resources>