Fix download sync and conflict issues

Author: zerox80

opencloudApp/src/main/java/eu/opencloud/android/usecases/synchronization/SynchronizeFileUseCase.kt

@@ -78,14 +78,20 @@ class SynchronizeFileUseCase(
         } catch (exception: FileNotFoundException) {
             Timber.i(exception, "File does not exist anymore in remote")
 
-            // 2.1 File does not exist anymore in remote
-            // If it still exists locally, but file has different path, another operation could have been done simultaneously
-            val localDbFile = fileToSynchronize.id?.let { fileRepository.getFileById(it) }
+            if (changedLocally) {
+                Timber.w("File deleted remotely but changed locally. Uploading local version instead of deleting.")
+                val uuid = requestForUpload(accountName, fileToSynchronize)
+                return SyncType.UploadEnqueued(uuid)
+            } else {
+                // 2.1 File does not exist anymore in remote
+                // If it still exists locally, but file has different path, another operation could have been done simultaneously
+                val localDbFile = fileToSynchronize.id?.let { fileRepository.getFileById(it) }
 
-            if (localDbFile != null && (localDbFile.remotePath == fileToSynchronize.remotePath && localDbFile.spaceId == fileToSynchronize.spaceId)) {
-               fileRepository.deleteFiles(listOf(fileToSynchronize), true)
+                if (localDbFile != null && (localDbFile.remotePath == fileToSynchronize.remotePath && localDbFile.spaceId == fileToSynchronize.spaceId)) {
+                   fileRepository.deleteFiles(listOf(fileToSynchronize), true)
+                }
+                return SyncType.FileNotFound
             }
-            return SyncType.FileNotFound
         }
 
         // 3. File not downloaded -> Download it
@@ -205,7 +211,10 @@ class SynchronizeFileUseCase(
     }
 
     private fun renameLocalFile(oldPath: String, newPath: String): Boolean = try {
-        File(oldPath).renameTo(File(newPath))
+        val oldFile = File(oldPath)
+        oldFile.copyTo(File(newPath), overwrite = true)
+        oldFile.delete()
+        true
     } catch (e: Exception) {
         Timber.e(e, "Failed to rename local file from $oldPath to $newPath")
         false

opencloudApp/src/main/java/eu/opencloud/android/workers/DownloadEverythingWorker.kt

@@ -91,6 +91,11 @@ class DownloadEverythingWorker(
             updateNotification("Found ${accounts.size} accounts")
 
             accounts.forEachIndexed { accountIndex, account ->
+                if (isStopped) {
+                    Timber.i("Worker stopped by system. Halting account processing.")
+                    return@forEachIndexed
+                }
+                
                 val accountName = account.name
                 Timber.i("Processing account ${accountIndex + 1}/${accounts.size}: $accountName")
                 updateNotification("Account ${accountIndex + 1}/${accounts.size}: $accountName")
@@ -210,6 +215,10 @@ class DownloadEverythingWorker(
             Timber.d("Folder ${folder.remotePath} contains ${folderContent.size} items")
 
             folderContent.forEach { item ->
+                if (isStopped) {
+                    Timber.i("Worker stopped by system. Halting folder processing.")
+                    return@forEach
+                }
                 if (item.isFolder) {
                     // Recursively process subfolders
                     processFolderRecursively(accountName, item, spaceId)

opencloudApp/src/main/java/eu/opencloud/android/workers/LocalFileSyncWorker.kt

@@ -86,6 +86,10 @@ class LocalFileSyncWorker(
                 Timber.d("Found ${downloadedFiles.size} downloaded files for account $accountName")
 
                 downloadedFiles.forEach { file ->
+                    if (isStopped) {
+                        Timber.i("Worker stopped by system. Halting sync.")
+                        return@forEach
+                    }
                     if (!file.isFolder) {
                         totalFilesChecked++
                         try {

opencloudApp/src/main/java/eu/opencloud/android/workers/UploadFileFromFileSystemWorker.kt

@@ -266,6 +266,8 @@ class UploadFileFromFileSystemWorker(
                         } catch (e: Exception) {
                             Timber.w(e, "Failed to refresh parent folder after creating conflicted copy")
                         }
+                        // ABORT the upload to prevent overwriting the server file
+                        throw IllegalStateException("Upload aborted due to conflict resolution policy. Saved as conflicted copy.")
                     } else {
                         Timber.w("Failed to copy local file to conflicted copy")
                     }

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

@@ -30,9 +30,4 @@ class ScopedStorageProvider(
 ) : LocalStorageProvider(rootFolderName) {
 
     override fun getPrimaryStorageDirectory(): File = Environment.getExternalStorageDirectory()
-
-    override fun getAccountDirectoryPath(accountName: String): String {
-        val sanitizedName = accountName.replace("/", "_").replace("\\", "_").replace(":", "_")
-        return getRootFolderPath() + File.separator + sanitizedName
-    }
 }

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

@@ -83,8 +83,10 @@ class ScopedStorageProviderTest {
 
     @Test
     fun `getDefaultSavePathFor returns the path with spaces when there is a space`() {
-        // ScopedStorageProvider overrides getAccountDirectoryPath and does NOT use Uri.encode
-        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + accountName
+        mockkStatic(Uri::class)
+        every { Uri.encode(accountName, "@") } returns uriEncoded
+
+        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + uriEncoded
         val expectedPath = accountDirectoryPath + File.separator + spaceId + File.separator + remotePath
         val actualPath = scopedStorageProvider.getDefaultSavePathFor(accountName, remotePath, spaceId)
 
@@ -99,8 +101,10 @@ class ScopedStorageProviderTest {
     fun `getDefaultSavePathFor returns the path without spaces when there is not space`() {
         val spaceId = null
 
-        // ScopedStorageProvider overrides getAccountDirectoryPath and does NOT use Uri.encode
-        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + accountName
+        mockkStatic(Uri::class)
+        every { Uri.encode(accountName, "@") } returns uriEncoded
+
+        val accountDirectoryPath = filesDir.absolutePath + File.separator + rootFolderName + File.separator + uriEncoded
         val expectedPath = accountDirectoryPath + remotePath
         val actualPath = scopedStorageProvider.getDefaultSavePathFor(accountName, remotePath, spaceId)