caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

If alarm is staledata dismis snoozes it

Browse source
This commit is contained in:
RoumenGeorgiev 2017-08-04 14:51:25 +03:00 committed by GitHub
parent 82541a50e4
commit 837dcdb23b
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -126,7 +126,9 @@ import info.nightscout.utils.Profiler;
import info.nightscout.utils.Round; import info.nightscout.utils.Round;
import info.nightscout.utils.SP; import info.nightscout.utils.SP;
import info.nightscout.utils.ToastUtils; import info.nightscout.utils.ToastUtils;
//Added By Rumen for staledata alarm
import info.nightscout.androidaps.plugins.Overview.Notification;
import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
private static Logger log = LoggerFactory.getLogger(OverviewFragment.class); private static Logger log = LoggerFactory.getLogger(OverviewFragment.class);
@ -744,6 +746,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
public void run() { public void run() {
scheduleUpdateGUI("refreshLoop"); scheduleUpdateGUI("refreshLoop");
sLoopHandler.postDelayed(sRefreshLoop, 60 * 1000L); sLoopHandler.postDelayed(sRefreshLoop, 60 * 1000L);
// Added by Rumen for STALE DATA ALARM
boolean isThereStaleData = Notification.isAlarmForStaleData();
log.debug("isThereIsStaleData: "+isThereStaleData);
if(isThereStaleData){
Notification notification = new Notification(Notification.NSALARM, getString(R.string.nsalarm_staledata), Notification.URGENT);
MainApp.bus().post(new EventNewNotification(notification));
}
// end of insert
} }
}; };
sLoopHandler.postDelayed(sRefreshLoop, 60 * 1000L); sLoopHandler.postDelayed(sRefreshLoop, 60 * 1000L);
@ -1802,6 +1812,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
if (notification.nsAlarm != null) { if (notification.nsAlarm != null) {
BroadcastAckAlarm.handleClearAlarm(notification.nsAlarm, MainApp.instance().getApplicationContext(), 60 * 60 * 1000L); BroadcastAckAlarm.handleClearAlarm(notification.nsAlarm, MainApp.instance().getApplicationContext(), 60 * 60 * 1000L);
} }
// Adding current time to snooze if we got staleData
log.debug("Notification text is: "+notification.text);
if(notification.text == MainApp.sResources.getString(R.string.nsalarm_staledata)){
NotificationStore nstore = getPlugin().notificationStore;
long msToSnooze = SP.getInt("nsalarm_staledatavalue",15)*60*1000L;
log.debug("snooze nsalarm_staledatavalue in minutes is "+SP.getInt("nsalarm_staledatavalue",15)+"\n in ms is: "+msToSnooze+" currentTimeMillis is: "+System.currentTimeMillis());
nstore.snoozeTo(System.currentTimeMillis()+(SP.getInt("nsalarm_staledatavalue",15)*60*1000L));
}
break; break;
} }
} }
@ -1816,6 +1834,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
public void run() { public void run() {
NotificationStore nstore = getPlugin().notificationStore; NotificationStore nstore = getPlugin().notificationStore;
nstore.removeExpired(); nstore.removeExpired();
nstore.unSnooze();
if (nstore.store.size() > 0) { if (nstore.store.size() > 0) {
RecyclerViewAdapter adapter = new RecyclerViewAdapter(nstore.store); RecyclerViewAdapter adapter = new RecyclerViewAdapter(nstore.store);
notificationsView.setAdapter(adapter); notificationsView.setAdapter(adapter);