X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/cf34250527fa13d82bc1591474362803d3d3a97c..43d7dfb1fa61e34447fa9af89435a00c50aaaea4:/tools/services/user_manager.py

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 4e7455b..662fb2a 100644
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -8,7 +8,7 @@ from tools.interfaces import IUserMonitor
 from tools.interfaces import IPlatform
 
 
-def start(args):
+def start(args, unlocked_cb=None):
     def makeDesktopFile(appInfo):
         showApp = False
         for cat in appInfo["categories"]:
@@ -20,7 +20,7 @@ def start(args):
         packageName = appInfo["packageName"]
 
         desktop_file_path = args.host_user + \
-            "/.local/share/applications/" + packageName + ".desktop"
+            "/.local/share/applications/waydroid." + packageName + ".desktop"
         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])
@@ -58,6 +58,10 @@ def start(args):
 
         platformService = IPlatform.get_service(args)
         if platformService:
+            apps_dir = "/.local/share/applications"
+            if not os.path.exists(apps_dir):
+                os.mkdir(apps_dir)
+                os.chmod(apps_dir, 0o700)
             appsList = platformService.getAppsInfo()
             for app in appsList:
                 makeDesktopFile(app)
@@ -66,6 +70,8 @@ def start(args):
                 makeWaydroidDesktopFile(False)
             else:
                 makeWaydroidDesktopFile(True)
+        if unlocked_cb:
+            unlocked_cb(args)
 
     def packageStateChanged(mode, packageName, uid):
         platformService = IPlatform.get_service(args)