feat(storage): migrate encoded account directories to readable names

Author: zerox80

opencloudData/src/main/java/eu/opencloud/android/data/providers/ScopedStorageProvider.kt

@@ -20,7 +20,9 @@
 package eu.opencloud.android.data.providers
 
 import android.content.Context
+import android.net.Uri
 import android.os.Environment
+import timber.log.Timber
 import java.io.File
 
 @Suppress("UnusedPrivateProperty")
@@ -30,4 +32,38 @@ class ScopedStorageProvider(
 ) : LocalStorageProvider(rootFolderName) {
 
     override fun getPrimaryStorageDirectory(): File = Environment.getExternalStorageDirectory()
+
+    override fun getAccountDirectoryPath(accountName: String): String {
+        val sanitizedName = accountName.replace("/", "_").replace("\\", "_").replace(":", "_")
+        val newPath = getRootFolderPath() + File.separator + sanitizedName
+        
+        val oldEncodedName = Uri.encode(accountName, "@")
+        val oldPath = getRootFolderPath() + File.separator + oldEncodedName
+        
+        if (oldPath != newPath) {
+            val oldDir = File(oldPath)
+            val newDir = File(newPath)
+            
+            // If old encoded directory exists, but the new readable one doesn't, migrate it!
+            if (oldDir.exists() && oldDir.isDirectory && !newDir.exists()) {
+                try {
+                    if (oldDir.renameTo(newDir)) {
+                        Timber.i("Successfully migrated account directory from $oldEncodedName to readable name $sanitizedName")
+                        return newPath
+                    } else {
+                        return oldPath // Fallback if rename fails
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to migrate account directory to readable name")
+                    return oldPath
+                }
+            } else if (oldDir.exists() && oldDir.isDirectory && newDir.exists()) {
+                // If both exist, we should probably stick to the new one or the old one. Let's use old one to not lose files
+                // that haven't been migrated yet.
+                return oldPath
+            }
+        }
+        
+        return newPath
+    }
 }

opencloudData/src/test/java/eu/opencloud/android/data/providers/ScopedStorageProviderTest.kt

@@ -86,7 +86,9 @@ class ScopedStorageProviderTest {
         mockkStatic(Uri::class)
         every { Uri.encode(accountName, "@") } returns uriEncoded
 
-        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + uriEncoded
+        // Since old directory doesn't exist, it should use the new sanitized account name "opencloud"
+        val expectedSanitizedName = accountName.replace("/", "_").replace("\\", "_").replace(":", "_")
+        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + expectedSanitizedName
         val expectedPath = accountDirectoryPath + File.separator + spaceId + File.separator + remotePath
         val actualPath = scopedStorageProvider.getDefaultSavePathFor(accountName, remotePath, spaceId)
 
@@ -104,7 +106,9 @@ class ScopedStorageProviderTest {
         mockkStatic(Uri::class)
         every { Uri.encode(accountName, "@") } returns uriEncoded
 
-        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + uriEncoded
+        // Since old directory doesn't exist, it should use the new sanitized account name "opencloud"
+        val expectedSanitizedName = accountName.replace("/", "_").replace("\\", "_").replace(":", "_")
+        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + expectedSanitizedName
         val expectedPath = accountDirectoryPath + remotePath
         val actualPath = scopedStorageProvider.getDefaultSavePathFor(accountName, remotePath, spaceId)