Don't change user-defined desktop files for Waydroid when they're set as read-only

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

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 3b5ea29e0d568435bd4d0b4c1448a4522a42025f..83a50cca58cb863d33c30d3a490a859527a0acfe 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -43,15 +43,20 @@ Actions=app_settings;
 [Desktop Action app_settings]
 Name=App Settings
 Exec=waydroid app intent android.settings.APPLICATION_DETAILS_SETTINGS package:{packageName}
+Icon={waydroid_data}/icons/com.android.settings.png
 """)
             return 0
 
     def makeWaydroidDesktopFile(hide):
         desktop_file_path = apps_dir + "/Waydroid.desktop"
-        if os.path.isfile(desktop_file_path):
-            os.remove(desktop_file_path)
-        with open(desktop_file_path, "w") as desktop_file:
-            desktop_file.write(f"""\
+        # If the user has set the desktop file as read-only, we won't replace it
+        if not os.access(desktop_file_path, os.W_OK):
+            logging.info(f"Desktop file '{desktop_file_path}' is not writeable, not updating it")
+        else:
+            if os.path.isfile(desktop_file_path):
+                os.remove(desktop_file_path)
+            with open(desktop_file_path, "w") as desktop_file:
+                desktop_file.write(f"""\
 [Desktop Entry]
 Type=Application
 Name=Waydroid
@@ -63,9 +68,11 @@ NoDisplay={str(hide).lower()}
 """)
 
     def userUnlocked(uid):
+        cfg = tools.config.load(args)
         logging.info("Android with user {} is ready".format(uid))
 
-        tools.helpers.net.adb_connect(args)
+        if cfg["waydroid"]["auto_adb"] == "True":
+            tools.helpers.net.adb_connect(args)
 
         platformService = IPlatform.get_service(args)
         if platformService: