Add first-launch command [v2]

[waydroid.git] / tools / services / user_manager.py

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index fc6552b7a986fe29f76c7a66b12f04c6a679fcde..1171e85981b3e3eb54b0d4cbe2db0320d5ecee22 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -7,6 +7,7 @@ import tools.config
 from tools.interfaces import IUserMonitor
 from tools.interfaces import IPlatform
 
 from tools.interfaces import IUserMonitor
 from tools.interfaces import IPlatform
 

+stopping = False

 
 def start(args, unlocked_cb=None):
 
 
 def start(args, unlocked_cb=None):
 


@@ -53,8 +54,8 @@ def start(args, unlocked_cb=None):
         logging.info("Android with user {} is ready".format(uid))
         session_cfg = tools.config.load_session()
         args.waydroid_data = session_cfg["session"]["waydroid_data"]
         logging.info("Android with user {} is ready".format(uid))
         session_cfg = tools.config.load_session()
         args.waydroid_data = session_cfg["session"]["waydroid_data"]

-        args.host_user = session_cfg["session"]["host_user"]
-        args.apps_dir = args.host_user + "/.local/share/applications/"
+        args.apps_dir = session_cfg["session"]["xdg_data_home"] + \
+            "/applications/"

 
         platformService = IPlatform.get_service(args)
         if platformService:
 
         platformService = IPlatform.get_service(args)
         if platformService:


@@ -89,12 +90,17 @@ def start(args, unlocked_cb=None):
                         os.remove(desktop_file_path)
 
     def service_thread():
                         os.remove(desktop_file_path)
 
     def service_thread():

-        IUserMonitor.add_service(args, userUnlocked, packageStateChanged)
+        while not stopping:
+            IUserMonitor.add_service(args, userUnlocked, packageStateChanged)

 
 

+    global stopping
+    stopping = False

     args.user_manager = threading.Thread(target=service_thread)
     args.user_manager.start()
 
 def stop(args):
     args.user_manager = threading.Thread(target=service_thread)
     args.user_manager.start()
 
 def stop(args):

+    global stopping
+    stopping = True

     try:
         if args.userMonitorLoop:
             args.userMonitorLoop.quit()
     try:
         if args.userMonitorLoop:
             args.userMonitorLoop.quit()