fix: changes related to the algorithm and changed deleted.recursively…

…() to delete()
owncloud · Jun 12, 2024 · 92a3724 · 92a3724
1 parent d039f7c
commit 92a3724
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt
@@ -493,7 +493,7 @@ class OCFileRepository(
                 localFileDataSource.cleanConflict(ocFile.id!!)
             }
             if (ocFile.isFolder) {
-                deleteLocalFolderRecursively(ocFile = ocFile, onlyFromLocalStorage = removeOnlyLocalCopy, removeAvailableOfflineFile = false)
+                deleteLocalFolderRecursively(ocFile = ocFile, onlyFromLocalStorage = removeOnlyLocalCopy)
             } else {
                 deleteLocalFile(ocFile = ocFile, onlyFromLocalStorage = removeOnlyLocalCopy)
             }
@@ -583,12 +583,12 @@ class OCFileRepository(
         localFileDataSource.cleanWorkersUuid(fileId)
     }
 
-    private fun deleteLocalFolderRecursively(ocFile: OCFile, onlyFromLocalStorage: Boolean, removeAvailableOfflineFile: Boolean = true) {
+    private fun deleteLocalFolderRecursively(ocFile: OCFile, onlyFromLocalStorage: Boolean) {
         val folderContent = localFileDataSource.getFolderContent(ocFile.id!!)
 
         // 1. Remove folder content recursively
         folderContent.forEach { file ->
-            if (removeAvailableOfflineFile || !file.isAvailableOffline) {
+            if (!onlyFromLocalStorage || !file.isAvailableOffline) {
                 if (file.isFolder) {
                     deleteLocalFolderRecursively(ocFile = file, onlyFromLocalStorage = onlyFromLocalStorage)
                 } else {

diff --git a/owncloudData/src/main/java/com/owncloud/android/data/providers/LocalStorageProvider.kt b/owncloudData/src/main/java/com/owncloud/android/data/providers/LocalStorageProvider.kt
@@ -218,7 +218,7 @@ sealed class LocalStorageProvider(private val rootFolderName: String) {
 
         val filesInFolder = folder.listFiles()
         if (filesInFolder.isNullOrEmpty()) {
-            folder.deleteRecursively()
+            folder.delete()
         }
     }