From dec685400ab0b6a64c82dc7b123e7ec77314e00f Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Sun, 29 Aug 2021 20:38:13 +0430 Subject: [PATCH] actions: Make sure container is running for showFullUI --- tools/actions/app_manager.py | 38 ++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/tools/actions/app_manager.py b/tools/actions/app_manager.py index 7bb19a2..fc5c224 100644 --- a/tools/actions/app_manager.py +++ b/tools/actions/app_manager.py @@ -101,13 +101,31 @@ def list(args): logging.error("WayDroid session is stopped") def showFullUI(args): - platformService = IPlatform.get_service(args) - if platformService: - platformService.setprop("waydroid.active_apps", "Waydroid") - platformService.settingsPutString(2, "policy_control", "null*") - #HACK: Refresh display contents - statusBarService = IStatusBarService.get_service(args) - if statusBarService: - statusBarService.expand() - time.sleep(0.5) - statusBarService.collapse() + def justShow(): + platformService = IPlatform.get_service(args) + if platformService: + platformService.setprop("waydroid.active_apps", "Waydroid") + platformService.settingsPutString(2, "policy_control", "null*") + # HACK: Refresh display contents + statusBarService = IStatusBarService.get_service(args) + if statusBarService: + statusBarService.expand() + time.sleep(0.5) + statusBarService.collapse() + + if os.path.exists(tools.config.session_defaults["config_path"]): + session_cfg = tools.config.load_session() + + if session_cfg["session"]["state"] == "RUNNING": + justShow() + elif session_cfg["session"]["state"] == "FROZEN" or session_cfg["session"]["state"] == "UNFREEZE": + session_cfg["session"]["state"] = "UNFREEZE" + tools.config.save_session(session_cfg) + while session_cfg["session"]["state"] != "RUNNING": + session_cfg = tools.config.load_session() + justShow() + else: + logging.error("WayDroid container is {}".format( + session_cfg["session"]["state"])) + else: + logging.error("WayDroid session is stopped") -- 2.47.3