session: Move waydroid user data to XDG_DATA_HOME

[waydroid.git] / tools / actions / session_manager.py

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index 0262c1a9456d70390a4fdcf54e0dad052113e237..6b2f3ebd400f155e1b050335cc470561e48556b3 100644 (file)
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -5,6 +5,7 @@ import os
 import time
 import signal
 import sys
+import shutil
 import tools.config
 from tools import services
 
@@ -20,6 +21,13 @@ def start(args, unlocked_cb=None):
 
     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:
+            os.removedirs(old_user_waydroid)
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")