caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fail on attempts to cancel non-running TBR.

Browse source 
Until we know this would be benign.
We still return 'enacted=true', so AAPS can mark the TBR as finished
to recover from this error state.
This commit is contained in:
Johannes Mockenhaupt 2017-07-19 22:15:04 +02:00
parent a1564d5bb7
commit bf179cd751
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
View file

@ -26,18 +26,16 @@ public class CancelTbrCommand implements Command {
try { try {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU); scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
if (!initialPumpState.tbrActive) { if (!initialPumpState.tbrActive) {
// this is likely a relatively harmless error like AAPS trying to cancel a TBR log.warn("No TBR active to cancel");
// that has run out in the last minute or so, but for debugging lets raise an error return new CommandResult()
// to make sure we can inspect this situation. // Raise a warning about this, until we know it's safe to ignore.
// Set enacted=true, so I record is created and AAPS stops thinking a TBR still .success(false)
// running and trying again to cancel it. // Technically, nothing was enacted, but AAPS needs this to recover
return new CommandResult().success(false).enacted(true).message("No TBR active"); // when there was an issue and AAPS thinks a TBR is still active,
/* // so the ComboPlugin can create a TempporaryBasel to mark the TBR
.success(true) // as finished to get in sync with the pump state.
.enacted(true) // technically, nothing was enacted, but AAPS needs this to recover .enacted(true)
// when there was an issue and AAPS thinks a TBR is still active
.message("No TBR active"); .message("No TBR active");
*/
} }
log.debug("Cancelling active TBR of " + initialPumpState.tbrPercent log.debug("Cancelling active TBR of " + initialPumpState.tbrPercent
+ "% with " + initialPumpState.tbrRemainingDuration + " min remaining"); + "% with " + initialPumpState.tbrRemainingDuration + " min remaining");