caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

Browse source
This commit is contained in:
Bart Sopers 2020-12-15 02:18:18 +01:00
commit 4a1bc45af1
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
View file

@ -222,7 +222,7 @@ public class AapsOmnipodManager {
uploadCareportalEvent(System.currentTimeMillis() - 1000, CareportalEvent.INSULINCHANGE); uploadCareportalEvent(System.currentTimeMillis() - 1000, CareportalEvent.INSULINCHANGE);
uploadCareportalEvent(System.currentTimeMillis(), CareportalEvent.SITECHANGE); uploadCareportalEvent(System.currentTimeMillis(), CareportalEvent.SITECHANGE);
sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED)); dismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED);
cancelSuspendedFakeTbrIfExists(); cancelSuspendedFakeTbrIfExists();
} }
@ -285,7 +285,7 @@ public class AapsOmnipodManager {
addSuccessToHistory(PodHistoryEntryType.DEACTIVATE_POD, null); addSuccessToHistory(PodHistoryEntryType.DEACTIVATE_POD, null);
createSuspendedFakeTbrIfNotExists(); createSuspendedFakeTbrIfNotExists();
sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_FAULT)); dismissNotification(Notification.OMNIPOD_POD_FAULT);
return new PumpEnactResult(injector).success(true).enacted(true); return new PumpEnactResult(injector).success(true).enacted(true);
} }
@ -345,8 +345,8 @@ public class AapsOmnipodManager {
showNotification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, null); showNotification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, null);
} }
sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE)); dismissNotification(Notification.FAILED_UDPATE_PROFILE);
sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED)); dismissNotification(Notification.OMNIPOD_POD_SUSPENDED);
return new PumpEnactResult(injector).success(true).enacted(true); return new PumpEnactResult(injector).success(true).enacted(true);
} }
@ -358,7 +358,7 @@ public class AapsOmnipodManager {
createSuspendedFakeTbrIfNotExists(); createSuspendedFakeTbrIfNotExists();
sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_FAULT)); dismissNotification(Notification.OMNIPOD_POD_FAULT);
sendEvent(new EventOmnipodPumpValuesChanged()); sendEvent(new EventOmnipodPumpValuesChanged());
sendEvent(new EventRefreshOverview("Omnipod command: " + OmnipodCommandType.DISCARD_POD, false)); sendEvent(new EventRefreshOverview("Omnipod command: " + OmnipodCommandType.DISCARD_POD, false));
@ -613,8 +613,8 @@ public class AapsOmnipodManager {
addSuccessToHistory(PodHistoryEntryType.SET_TIME, null); addSuccessToHistory(PodHistoryEntryType.SET_TIME, null);
sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE)); dismissNotification(Notification.FAILED_UDPATE_PROFILE);
sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED)); dismissNotification(Notification.OMNIPOD_POD_SUSPENDED);
return new PumpEnactResult(injector).success(true).enacted(true); return new PumpEnactResult(injector).success(true).enacted(true);
} }
@ -965,6 +965,10 @@ public class AapsOmnipodManager {
sendEvent(new EventNewNotification(notification)); sendEvent(new EventNewNotification(notification));
} }
private void dismissNotification(int id) {
sendEvent(new EventDismissNotification(id));
}
private String getStringResource(int id, Object... args) { private String getStringResource(int id, Object... args) {
return resourceHelper.gs(id, args); return resourceHelper.gs(id, args);
} }