caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Optimize cancelling TBR.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-15 21:26:18 +02:00
parent 3aecf0f58b
commit 4c0944b9f8
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -190,8 +190,7 @@ public class SetTbrCommand implements Command {
// we could read remaining duration from MAIN_MENU, but but the time we're here, // we could read remaining duration from MAIN_MENU, but but the time we're here,
// we could have moved from 0:02 to 0:01, so instead, check if a "TBR CANCELLED alert" // we could have moved from 0:02 to 0:01, so instead, check if a "TBR CANCELLED alert"
// is raised and if so dismiss it // is raised and if so dismiss it
scripter.waitForMenuToBeLeft(MenuType.TBR_SET); long inTwoSeconds = System.currentTimeMillis() + 5 * 1000;
long inTwoSeconds = System.currentTimeMillis() + 2 * 1000;
boolean alertProcessed = false; boolean alertProcessed = false;
while (System.currentTimeMillis() < inTwoSeconds && !alertProcessed) { while (System.currentTimeMillis() < inTwoSeconds && !alertProcessed) {
if (scripter.currentMenu.getType() == MenuType.WARNING_OR_ERROR) { if (scripter.currentMenu.getType() == MenuType.WARNING_OR_ERROR) {
@ -207,13 +206,12 @@ public class SetTbrCommand implements Command {
} }
// confirm "TBR CANCELLED alert" // confirm "TBR CANCELLED alert"
scripter.pressCheckKey(); scripter.pressCheckKey();
SystemClock.sleep(200);
// dismiss "TBR CANCELLED alert" // dismiss "TBR CANCELLED alert"
scripter.pressCheckKey(); scripter.pressCheckKey();
scripter.waitForMenuToBeLeft(MenuType.WARNING_OR_ERROR); scripter.waitForMenuToBeLeft(MenuType.WARNING_OR_ERROR);
alertProcessed = true; alertProcessed = true;
} }
SystemClock.sleep(50); SystemClock.sleep(10);
} }
} }