wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt

@@ -89,12 +89,12 @@ fun FileDataStorageManager.moveFiles(ocFile: OCFile?, targetPath: String, target
     }
 
     if (OCFile.ROOT_PATH == ocFile.fileName) {
-        Log_OC.e(FileDataStorageManager.TAG, "moveLocalFile: cannot move root path")
+        Log_OC.w(FileDataStorageManager.TAG, "moveLocalFile: cannot move root path")
         return
     }
 
     if (ocFile.remotePath == targetPath) {
-        Log_OC.e(FileDataStorageManager.TAG, "moveLocalFile: source and target paths are identical, skipping")
+        Log_OC.w(FileDataStorageManager.TAG, "moveLocalFile: source and target paths are identical, skipping")
         return
     }
 
@@ -113,12 +113,12 @@ fun FileDataStorageManager.moveFiles(ocFile: OCFile?, targetPath: String, target
     val accountName = user.accountName
     val defaultSavePath = FileStorageUtils.getSavePath(accountName)
 
-    val originalMediaPaths =
-        fileDao.moveFilesInDb(oldPath, targetPath, defaultSavePath, targetParent.fileId, accountName)
-
     val moved = moveLocalFiles(accountName, ocFile, defaultSavePath, targetPath)
     if (!moved) return
 
+    val originalMediaPaths =
+        fileDao.moveFilesInDb(oldPath, targetPath, defaultSavePath, targetParent.fileId, accountName)
+
     for (originalMediaPath in originalMediaPaths) {
         deleteFileInMediaScan(originalMediaPath)
         val newMediaPath = defaultSavePath + targetPath + originalMediaPath.substring(

app/src/test/java/com/owncloud/android/datamodel/MoveFilesGuardTest.kt

@@ -24,7 +24,7 @@ class MoveFilesGuardTest : MoveFilesTestBase() {
 
     @Test
     fun testMoveLocalFileWhenFileDoesNotExistShouldReturnEarlyWithoutInteractingWithDatabase() {
-        val file = OCFile(OLD_PATH).apply { fileId = 0 }
+        val file = OCFile(OLD_PATH).apply { fileId = -1 }
 
         manager.moveLocalFile(file, TARGET_PATH, TARGET_PARENT_PATH)