session: Nuke old data dir movement

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index e1a0ba08fd1e5db1b6d3f65252098ef95e6a2ce7..86c9cddf773505e2c70351d0f1882ac2976d8ed9 100644 (file)
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -21,13 +21,6 @@ def start(args, unlocked_cb=None):
 
     cfg = tools.config.load_session()
     waydroid_data = cfg["session"]["waydroid_data"]
 
     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")
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 09b6bab0a240a0a96952275699c1ea13c593c526..137c5de7287e1fd39f1f9f2a7e95dccf3f71033d 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -21,16 +21,6 @@ def start(args, unlocked_cb=None):
         packageName = appInfo["packageName"]
 
         desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"
         packageName = appInfo["packageName"]
 
         desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"

-        #TODO: Drop me
-        if os.path.exists(desktop_file_path):
-            with open(desktop_file_path) as file:
-                filedata = file.read()
-            filedata = filedata.replace(
-                "Icon=" + args.old_waydroid_data, "Icon=" + args.waydroid_data)
-            with open(desktop_file_path, 'w') as file:
-                file.write(filedata)
-            os.chmod(desktop_file_path, 0o755)
-

         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])
         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])


@@ -63,9 +53,6 @@ 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"]

-        #TODO: Drop me
-        args.old_waydroid_data = session_cfg["session"]["host_user"] + \
-            "/waydroid/data"

         args.apps_dir = session_cfg["session"]["xdg_data_home"] + \
             "/applications/"
 
         args.apps_dir = session_cfg["session"]["xdg_data_home"] + \
             "/applications/"