caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

When recovering from connection loss, return to main menu to be ready for the net command.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-24 23:04:37 +01:00
parent 5e79900411
commit 5bd010d8f1
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -421,6 +421,12 @@ public class RuffyScripter implements RuffyCommands {
waitForScreenUpdate(); waitForScreenUpdate();
} }
boolean connected = ruffyService.isConnected(); boolean connected = ruffyService.isConnected();
if (connected) {
MenuType menuType = getCurrentMenu().getType();
if (menuType != MenuType.MAIN_MENU && menuType != MenuType.WARNING_OR_ERROR) {
returnToRootMenu();
}
}
log.debug("Recovery from connection loss " + (connected ? "succeeded" : "failed")); log.debug("Recovery from connection loss " + (connected ? "succeeded" : "failed"));
return connected; return connected;
} catch (RemoteException e) { } catch (RemoteException e) {