caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Declare RuffyScripter.currentMenu nullable.

Browse source 
(cherry picked from commit fb0c829)
This commit is contained in:
Johannes Mockenhaupt 2017-09-06 11:13:35 +02:00
parent 15bac4d386
commit 5d10956900
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java
View file

@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.PumpCombo.scripter;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
@ -36,6 +37,7 @@ public class RuffyScripter {
private IRuffyService ruffyService; private IRuffyService ruffyService;
private String unrecoverableError = null; private String unrecoverableError = null;
@Nullable
private volatile Menu currentMenu; private volatile Menu currentMenu;
private volatile long menuLastUpdated = 0; private volatile long menuLastUpdated = 0;
@ -194,13 +196,20 @@ public class RuffyScripter {
} }
public void returnToMainMenu() { public void returnToMainMenu() {
// returning to main menu using the 'back' key should not cause a vibration // returning to main menu using the 'back' key does not cause a vibration
// TODO this is too brute-force; at least check for WARNING_OR_ERROR menu type while (getCurrentMenu().getType() != MenuType.MAIN_MENU) {
do { if (getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR) {
String errorMsg = (String) getCurrentMenu().getAttribute(MenuAttribute.MESSAGE);
confirmAlert(errorMsg, 1000);
// TODO this isn't gonna work out ... this method can't know if something was enacted ...
// gotta keep that state in the command instance
throw new CommandException().success(false).enacted(false)
.message("Warning/error " + errorMsg + " raised while returning to main menu");
}
log.debug("Going back to main menu, currently at " + getCurrentMenu().getType()); log.debug("Going back to main menu, currently at " + getCurrentMenu().getType());
pressBackKey(); pressBackKey();
waitForMenuUpdate(); waitForMenuUpdate();
} while (getCurrentMenu().getType() != MenuType.MAIN_MENU); }
} }
private static class Returnable { private static class Returnable {