net: Disable NFT by default

[waydroid.git] / tools / actions / session_manager.py

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index 7d89757edeeb027f7854d5359c0d85fac4542190..e1a0ba08fd1e5db1b6d3f65252098ef95e6a2ce7 100644 (file)
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -5,11 +5,12 @@ import os
 import time
 import signal
 import sys
+import shutil
 import tools.config
 from tools import services
 
 
-def start(args):
+def start(args, unlocked_cb=None):
     def signal_handler(sig, frame):
         stop(args)
         sys.exit(0)
@@ -20,6 +21,13 @@ def start(args):
 
     cfg = tools.config.load_session()
     waydroid_data = cfg["session"]["waydroid_data"]
+    #TODO: Drop me
+    old_user_waydroid = cfg["session"]["host_user"] + "/waydroid"
+    if os.path.isdir(old_user_waydroid):
+        if not os.path.isdir(waydroid_data):
+            shutil.move(old_user_waydroid, cfg["session"]["xdg_data_home"])
+        else:
+            shutil.rmtree(old_user_waydroid, ignore_errors=True)
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")
@@ -32,11 +40,20 @@ def start(args):
     cfg["session"]["lcd_density"] = dpi
     tools.config.save_session(cfg)
 
-    services.user_manager.start(args)
-    services.clipboard_manager.start(args)
-
+    container_state = "IDLE"
     signal.signal(signal.SIGINT, signal_handler)
     while os.path.exists(tools.config.session_defaults["config_path"]):
+        session_cfg = tools.config.load_session()
+        if container_state != session_cfg["session"]["state"]:
+            if session_cfg["session"]["state"] == "RUNNING":
+                services.user_manager.start(args, unlocked_cb)
+                services.clipboard_manager.start(args)
+                if unlocked_cb:
+                    unlocked_cb = None
+            elif session_cfg["session"]["state"] == "STOPPED":
+                services.user_manager.stop(args)
+                services.clipboard_manager.stop(args)
+            container_state = session_cfg["session"]["state"]
         time.sleep(1)
     services.user_manager.stop(args)
     services.clipboard_manager.stop(args)