fix: changed variable isActionSetFolderAvailableOffline and set to tr…

…ue in syncFile
owncloud · Jun 13, 2024 · 080a201 · 080a201
1 parent 62a76c5
commit 080a201
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 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
@@ -529,7 +529,7 @@ class MainFileListFragment : Fragment(),
                                             FileOperation.SynchronizeFolderOperation(
                                                 folderToSync = file,
                                                 accountName = file.owner,
-                                                isActionSetFolderAvailableOffline = true,
+                                                isActionSetFolderAvailableOfflineOrSynchronize = true,
                                             )
                                         )
                                     } else {
@@ -1139,7 +1139,7 @@ class MainFileListFragment : Fragment(),
                             FileOperation.SynchronizeFolderOperation(
                                 folderToSync = singleFile,
                                 accountName = singleFile.owner,
-                                isActionSetFolderAvailableOffline = true,
+                                isActionSetFolderAvailableOfflineOrSynchronize = true,
                             )
                         )
                     } else {
@@ -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,
+                        isActionSetFolderAvailableOfflineOrSynchronize = 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,11 @@ 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 isActionSetFolderAvailableOfflineOrSynchronize: 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
@@ -260,7 +260,7 @@ class FileOperationsViewModel(
                 accountName = fileOperation.folderToSync.owner,
                 spaceId = fileOperation.folderToSync.spaceId,
                 syncMode = SynchronizeFolderUseCase.SyncFolderMode.SYNC_FOLDER_RECURSIVELY,
-                isActionSetFolderAvailableOffline = fileOperation.isActionSetFolderAvailableOffline,
+                isActionSetFolderAvailableOfflineOrSynchronize = fileOperation.isActionSetFolderAvailableOfflineOrSynchronize,
             )
         )
     }

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
@@ -41,7 +41,7 @@ class SynchronizeFolderUseCase(
             remotePath = remotePath,
             accountName = accountName,
             spaceId = params.spaceId,
-            isActionSetFolderAvailableOffline = params.isActionSetFolderAvailableOffline,
+            isActionSetFolderAvailableOfflineOrSynchronize = params.isActionSetFolderAvailableOfflineOrSynchronize,
         )
 
         folderContent.forEach { ocFile ->
@@ -53,7 +53,7 @@ class SynchronizeFolderUseCase(
                             accountName = accountName,
                             spaceId = ocFile.spaceId,
                             syncMode = params.syncMode,
-                            isActionSetFolderAvailableOffline = params.isActionSetFolderAvailableOffline,
+                            isActionSetFolderAvailableOfflineOrSynchronize = params.isActionSetFolderAvailableOfflineOrSynchronize,
                         )
                     )
                 }
@@ -78,7 +78,7 @@ class SynchronizeFolderUseCase(
         val accountName: String,
         val spaceId: String? = null,
         val syncMode: SyncFolderMode,
-        val isActionSetFolderAvailableOffline: Boolean = false,
+        val isActionSetFolderAvailableOfflineOrSynchronize: 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
@@ -378,7 +378,7 @@ class OCFileRepository(
         remotePath: String,
         accountName: String,
         spaceId: String?,
-        isActionSetFolderAvailableOffline: Boolean,
+        isActionSetFolderAvailableOfflineOrSynchronize: Boolean,
     ): List<OCFile> {
         val spaceWebDavUrl = localSpacesDataSource.getWebDavUrlForSpace(spaceId, accountName)
 
@@ -427,7 +427,7 @@ class OCFileRepository(
                         })
                 } else if (localChildToSync.etag != remoteChild.etag ||
                     localChildToSync.localModificationTimestamp > remoteChild.lastSyncDateForData!! ||
-                    isActionSetFolderAvailableOffline
+                    isActionSetFolderAvailableOfflineOrSynchronize
                 ) {
                     // 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,12 @@ 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,
+        isActionSetFolderAvailableOfflineOrSynchronize: Boolean = false
+    ): List<OCFile>
     fun deleteFiles(listOfFilesToDelete: List<OCFile>, removeOnlyLocalCopy: Boolean)
     fun renameFile(ocFile: OCFile, newName: String)
     fun saveFile(file: OCFile)