packaging: install icons to xdg icons resource path, and get the .desktop file to...

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

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index c33f18952f9a73e6cd281b3a0f8ef7e9b005fc7c..5e03d255a300a61fbc64447d6a9dc51713ec6efb 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -9,7 +9,7 @@ from tools.interfaces import IPlatform
 
 stopping = False
 
 
 stopping = False
 

-def start(args, unlocked_cb=None):
+def start(args, session, unlocked_cb=None):

 
     def makeDesktopFile(appInfo):
         showApp = False
 
     def makeDesktopFile(appInfo):
         showApp = False


@@ -45,7 +45,7 @@ def start(args, unlocked_cb=None):
         lines.append("X-Purism-FormFactor=Workstation;Mobile;")
         if hide:
             lines.append("NoDisplay=true")
         lines.append("X-Purism-FormFactor=Workstation;Mobile;")
         if hide:
             lines.append("NoDisplay=true")

-        lines.append("Icon=" + tools.config.tools_src + "/data/AppIcon.png")
+        lines.append("Icon=waydroid")

         desktop_file = open(desktop_file_path, "w")
         for line in lines:
             desktop_file.write(line + "\n")
         desktop_file = open(desktop_file_path, "w")
         for line in lines:
             desktop_file.write(line + "\n")


@@ -54,9 +54,8 @@ def start(args, unlocked_cb=None):
 
     def userUnlocked(uid):
         logging.info("Android with user {} is ready".format(uid))
 
     def userUnlocked(uid):
         logging.info("Android with user {} is ready".format(uid))

-        session_cfg = tools.config.load_session()
-        args.waydroid_data = session_cfg["session"]["waydroid_data"]
-        args.apps_dir = session_cfg["session"]["xdg_data_home"] + \
+        args.waydroid_data = session["waydroid_data"]
+        args.apps_dir = session["xdg_data_home"] + \

             "/applications/"
 
         platformService = IPlatform.get_service(args)
             "/applications/"
 
         platformService = IPlatform.get_service(args)


@@ -73,13 +72,13 @@ def start(args, unlocked_cb=None):
             else:
                 makeWaydroidDesktopFile(True)
         if unlocked_cb:
             else:
                 makeWaydroidDesktopFile(True)
         if unlocked_cb:

-            unlocked_cb(args)
+            unlocked_cb()

 
     def packageStateChanged(mode, packageName, uid):
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)
 
     def packageStateChanged(mode, packageName, uid):
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)

-            desktop_file_path = args.apps_dir + "/" + packageName + ".desktop"
+            desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"

             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)
             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)