fix: added variable isActionSynchronize to cover synchronize action

owncloud · Jun 13, 2024 · bb9cacf · bb9cacf
1 parent 62a76c5
commit bb9cacf
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 5 deletions.
diff --git a/...pp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/...pp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -1391,7 +1391,13 @@ class MainFileListFragment : Fragment(),
     private fun syncFiles(files: List<OCFile>) {
         for (file in files) {
             if (file.isFolder) {
-                fileOperationsViewModel.performOperation(FileOperation.SynchronizeFolderOperation(folderToSync = file, accountName = file.owner))
+                fileOperationsViewModel.performOperation(
+                    FileOperation.SynchronizeFolderOperation(
+                        folderToSync = file,
+                        accountName = file.owner,
+                        isActionSynchronize = true
+                    )
+                )
             } else {
                 fileOperationsViewModel.performOperation(FileOperation.SynchronizeFileOperation(fileToSync = file, accountName = file.owner))
             }

diff --git a/...loudApp/src/main/java/com/owncloud/android/presentation/files/operations/FileOperation.kt b/...loudApp/src/main/java/com/owncloud/android/presentation/files/operations/FileOperation.kt
@@ -45,7 +45,12 @@ sealed interface FileOperation {
     data class RemoveOperation(val listOfFilesToRemove: List<OCFile>, val removeOnlyLocalCopy: Boolean) : FileOperation
     data class RenameOperation(val ocFileToRename: OCFile, val newName: String) : FileOperation
     data class SynchronizeFileOperation(val fileToSync: OCFile, val accountName: String) : FileOperation
-    data class SynchronizeFolderOperation(val folderToSync: OCFile, val accountName: String, val isActionSetFolderAvailableOffline: Boolean = false) : FileOperation
+    data class SynchronizeFolderOperation(
+        val folderToSync: OCFile,
+        val accountName: String,
+        val isActionSetFolderAvailableOffline: Boolean = false,
+        val isActionSynchronize: Boolean = false
+    ) : FileOperation
     data class RefreshFolderOperation(val folderToRefresh: OCFile, val shouldSyncContents: Boolean) : FileOperation
     data class CreateFileWithAppProviderOperation(val accountName: String, val parentContainerId: String, val filename: String) : FileOperation
     data class SetFilesAsAvailableOffline(val filesToUpdate: List<OCFile>) : FileOperation

diff --git a/...c/main/java/com/owncloud/android/presentation/files/operations/FileOperationsViewModel.kt b/...c/main/java/com/owncloud/android/presentation/files/operations/FileOperationsViewModel.kt
@@ -35,9 +35,9 @@ import com.owncloud.android.domain.availableoffline.usecases.SetFilesAsAvailable
 import com.owncloud.android.domain.availableoffline.usecases.UnsetFilesAsAvailableOfflineUseCase
 import com.owncloud.android.domain.exceptions.NoNetworkConnectionException
 import com.owncloud.android.domain.files.model.OCFile
-import com.owncloud.android.domain.files.usecases.IsAnyFileAvailableLocallyAndNotAvailableOfflineUseCase
 import com.owncloud.android.domain.files.usecases.CopyFileUseCase
 import com.owncloud.android.domain.files.usecases.CreateFolderAsyncUseCase
+import com.owncloud.android.domain.files.usecases.IsAnyFileAvailableLocallyAndNotAvailableOfflineUseCase
 import com.owncloud.android.domain.files.usecases.ManageDeepLinkUseCase
 import com.owncloud.android.domain.files.usecases.MoveFileUseCase
 import com.owncloud.android.domain.files.usecases.RemoveFileUseCase
@@ -261,6 +261,7 @@ class FileOperationsViewModel(
                 spaceId = fileOperation.folderToSync.spaceId,
                 syncMode = SynchronizeFolderUseCase.SyncFolderMode.SYNC_FOLDER_RECURSIVELY,
                 isActionSetFolderAvailableOffline = fileOperation.isActionSetFolderAvailableOffline,
+                isActionSynchronize = fileOperation.isActionSynchronize,
             )
         )
     }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -234,6 +234,7 @@ private void synchronizeFolder(OCFile folder) {
                 folder.getOwner(),
                 folder.getSpaceId(),
                 SynchronizeFolderUseCase.SyncFolderMode.REFRESH_FOLDER_RECURSIVELY,
+                false,
                 false);
         UseCaseResult<Unit> useCaseResult;
 

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -199,6 +199,7 @@ public void syncFile(OCFile file) {
                             file.getOwner(),
                             file.getSpaceId(),
                             SynchronizeFolderUseCase.SyncFolderMode.SYNC_FOLDER_RECURSIVELY,
+                            false,
                             false)
             );
         }

diff --git a/...p/src/main/java/com/owncloud/android/usecases/synchronization/SynchronizeFolderUseCase.kt b/...p/src/main/java/com/owncloud/android/usecases/synchronization/SynchronizeFolderUseCase.kt
@@ -42,6 +42,7 @@ class SynchronizeFolderUseCase(
             accountName = accountName,
             spaceId = params.spaceId,
             isActionSetFolderAvailableOffline = params.isActionSetFolderAvailableOffline,
+            isActionSynchronize = params.isActionSynchronize,
         )
 
         folderContent.forEach { ocFile ->
@@ -54,6 +55,7 @@ class SynchronizeFolderUseCase(
                             spaceId = ocFile.spaceId,
                             syncMode = params.syncMode,
                             isActionSetFolderAvailableOffline = params.isActionSetFolderAvailableOffline,
+                            isActionSynchronize = params.isActionSynchronize
                         )
                     )
                 }
@@ -79,6 +81,7 @@ class SynchronizeFolderUseCase(
         val spaceId: String? = null,
         val syncMode: SyncFolderMode,
         val isActionSetFolderAvailableOffline: Boolean = false,
+        val isActionSynchronize: Boolean = false,
     )
 
     /**

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
@@ -379,6 +379,7 @@ class OCFileRepository(
         accountName: String,
         spaceId: String?,
         isActionSetFolderAvailableOffline: Boolean,
+        isActionSynchronize: Boolean,
     ): List<OCFile> {
         val spaceWebDavUrl = localSpacesDataSource.getWebDavUrlForSpace(spaceId, accountName)
 
@@ -427,7 +428,8 @@ class OCFileRepository(
                         })
                 } else if (localChildToSync.etag != remoteChild.etag ||
                     localChildToSync.localModificationTimestamp > remoteChild.lastSyncDateForData!! ||
-                    isActionSetFolderAvailableOffline
+                    isActionSetFolderAvailableOffline ||
+                    isActionSynchronize
                 ) {
                     // File exists in the database, we need to check several stuff.
                     folderContentUpdated.add(

diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt
@@ -57,7 +57,13 @@ interface FileRepository {
     // Returns files in conflict
     fun moveFile(listOfFilesToMove: List<OCFile>, targetFolder: OCFile, replace: List<Boolean?> = emptyList(), isUserLogged: Boolean): List<OCFile>
     fun readFile(remotePath: String, accountName: String, spaceId: String? = null): OCFile
-    fun refreshFolder(remotePath: String, accountName: String, spaceId: String? = null, isActionSetFolderAvailableOffline: Boolean = false): List<OCFile>
+    fun refreshFolder(
+        remotePath: String,
+        accountName: String,
+        spaceId: String? = null,
+        isActionSetFolderAvailableOffline: Boolean = false,
+        isActionSynchronize: Boolean = false
+    ): List<OCFile>
     fun deleteFiles(listOfFilesToDelete: List<OCFile>, removeOnlyLocalCopy: Boolean)
     fun renameFile(ocFile: OCFile, newName: String)
     fun saveFile(file: OCFile)