Only update necessary sub-dirs

Signed-off-by: alperozturk <[email protected]>
nextcloud · Aug 30, 2024 · 2fae93f · 2fae93f
1 parent 8bd9e90
commit 2fae93f
Show file tree

Hide file tree

Showing 4 changed files with 8 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
@@ -115,7 +115,7 @@ class OfflineOperationsWorker(
         Log_OC.d(TAG, "$logMessage path: ${operation.path}, type: ${operation.type}")
 
         if (result.isSuccess) {
-            repository.updateNextOperations()
+            repository.updateNextOperations(operation)
             fileDataStorageManager.offlineOperationDao.delete(operation)
             notificationManager.update(operations.size, currentOperationIndex, operation.filename ?: "")
         } else {

diff --git a/...ava/com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepository.kt b/...ava/com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepository.kt
@@ -61,8 +61,11 @@ class OfflineOperationsRepository(
         fileDataStorageManager.removeFile(file, true, true)
     }
 
-    override fun updateNextOperations() {
-        dao.getAll()
+    override fun updateNextOperations(operation: OfflineOperationEntity) {
+        val ocFile = fileDataStorageManager.getFileByDecryptedRemotePath(operation.path)
+        val fileId = ocFile?.fileId ?: return
+
+        getAllSubdirectories(fileId)
             .mapNotNull { nextOperation ->
                 nextOperation.parentOCFileId?.let { parentId ->
                     fileDataStorageManager.getFileById(parentId)?.let { ocFile ->

diff --git a/...com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepositoryType.kt b/...com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepositoryType.kt
@@ -13,5 +13,5 @@ import com.owncloud.android.datamodel.OCFile
 interface OfflineOperationsRepositoryType {
     fun getAllSubdirectories(fileId: Long): List<OfflineOperationEntity>
     fun deleteOperation(file: OCFile)
-    fun updateNextOperations()
+    fun updateNextOperations(operation: OfflineOperationEntity)
 }
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -203,7 +203,7 @@ public void keepOfflineOperationAndServerFile(OfflineOperationEntity entity, OCF
         String newFolderName = oldFileName + " - " + currentDateTime;
         String newPath = parentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
         moveLocalFile(file, newPath, parentFolder.getDecryptedRemotePath());
-        offlineOperationsRepository.updateNextOperations();
+        offlineOperationsRepository.updateNextOperations(entity);
     }
 
     private @Nullable