Add rename support for file itself

nextcloud · Sep 2, 2024 · 617dd6e · 617dd6e
1 parent 711fad7
commit 617dd6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/com/nextcloud/client/jobs/offlineOperations/OfflineOperationsWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/offlineOperations/OfflineOperationsWorker.kt
@@ -50,6 +50,7 @@ class OfflineOperationsWorker(
 
     @Suppress("TooGenericExceptionCaught")
     override suspend fun doWork(): Result = coroutineScope {
+        // fileDataStorageManager.offlineOperationDao.clearTable()
         val jobName = inputData.getString(JOB_NAME)
         Log_OC.d(
             TAG,

diff --git a/app/src/main/java/com/nextcloud/model/OfflineOperationType.kt b/app/src/main/java/com/nextcloud/model/OfflineOperationType.kt
@@ -10,7 +10,7 @@ package com.nextcloud.model
 sealed class OfflineOperationType {
     abstract val type: String
 
-    data class CreateFolder(override val type: String, val path: String) : OfflineOperationType()
+    data class CreateFolder(override val type: String, var path: String) : OfflineOperationType()
     data class CreateFile(
         override val type: String,
         val localPath: String,

diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -206,7 +206,7 @@ public void deleteOfflineOperation(OCFile file) {
         offlineOperationsRepository.deleteOperation(file);
     }
 
-    public void renameCreateFolderOfflineOperation(OCFile file, String newFolderName) {
+    public void renameOfflineOperation(OCFile file, String newFolderName) {
         var entity = offlineOperationDao.getByPath(file.getDecryptedRemotePath());
         if (entity == null) {
             return;
@@ -219,8 +219,13 @@ public void renameCreateFolderOfflineOperation(OCFile file, String newFolderName
 
         String newPath = parentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
 
-        OfflineOperationType.CreateFolder operationType = new OfflineOperationType.CreateFolder(OfflineOperationRawType.CreateFolder.name(), newPath);
-        entity.setType(operationType);
+        if (entity.getType() instanceof OfflineOperationType.CreateFolder createFolderType) {
+            createFolderType.setPath(newPath);
+        } else if (entity.getType() instanceof OfflineOperationType.CreateFile createFileType) {
+            createFileType.setRemotePath(newPath);
+        }
+        entity.setType(entity.getType());
+
         entity.setPath(newPath);
         entity.setFilename(newFolderName);
         offlineOperationDao.update(entity);

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.kt
@@ -146,7 +146,7 @@ class RenameFileDialogFragment : DialogFragment(), DialogInterface.OnClickListen
             }
 
             if (mTargetFile?.isOfflineOperation == true) {
-                fileDataStorageManager.renameCreateFolderOfflineOperation(mTargetFile, newFileName)
+                fileDataStorageManager.renameOfflineOperation(mTargetFile, newFileName)
                 if (requireActivity() is FileDisplayActivity) {
                     val activity = requireActivity() as FileDisplayActivity
                     activity.refreshCurrentDirectory()