[New arch] Available offline fixes

owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/details/FileDetailsFragment.kt

@@ -115,6 +115,7 @@ class FileDetailsFragment : FileFragment() {
                 is UIResult.Error -> {
                     showErrorInSnackbar(R.string.sync_fail_ticker, uiResult.error)
                     fileDetailsViewModel.updateActionInDetailsView(NONE)
+                    requireActivity().invalidateOptionsMenu()
                 }
                 is UIResult.Loading -> {}
                 is UIResult.Success -> when (uiResult.data) {

owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/operations/FileOperation.kt

@@ -21,13 +21,13 @@ package com.owncloud.android.presentation.ui.files.operations
 
 import com.owncloud.android.domain.files.model.OCFile
 
-sealed class FileOperation {
-    data class CopyOperation(val listOfFilesToCopy: List<OCFile>, val targetFolder: OCFile) : FileOperation()
-    data class CreateFolder(val folderName: String, val parentFile: OCFile) : FileOperation()
-    data class MoveOperation(val listOfFilesToMove: List<OCFile>, val targetFolder: OCFile) : 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 SetFilesAsAvailableOffline(val filesToUpdate: List<OCFile>) : FileOperation()
-    data class UnsetFilesAsAvailableOffline(val filesToUpdate: List<OCFile>) : FileOperation()
+sealed interface FileOperation {
+    data class CopyOperation(val listOfFilesToCopy: List<OCFile>, val targetFolder: OCFile) : FileOperation
+    data class CreateFolder(val folderName: String, val parentFile: OCFile) : FileOperation
+    data class MoveOperation(val listOfFilesToMove: List<OCFile>, val targetFolder: OCFile) : 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 SetFilesAsAvailableOffline(val filesToUpdate: List<OCFile>) : FileOperation
+    data class UnsetFilesAsAvailableOffline(val filesToUpdate: List<OCFile>) : FileOperation
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/ui/settings/SettingsActivity.kt

@@ -36,7 +36,6 @@ import com.owncloud.android.presentation.ui.settings.fragments.SettingsMoreFragm
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsPictureUploadsFragment
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsVideoUploadsFragment
-import com.owncloud.android.providers.WorkManagerProvider
 import com.owncloud.android.ui.activity.FileDisplayActivity
 
 class SettingsActivity : AppCompatActivity() {
@@ -62,12 +61,6 @@ class SettingsActivity : AppCompatActivity() {
         redirectToSubsection(intent)
     }
 
-    override fun onDestroy() {
-        val workerProvider = WorkManagerProvider(context = this)
-        workerProvider.enqueueAvailableOfflinePeriodicWorker()
-        super.onDestroy()
-    }
-
     private fun updateToolbarTitle() {
         val titleId = when (supportFragmentManager.fragments.lastOrNull()) {
             is SettingsSecurityFragment -> R.string.prefs_subsection_security

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -81,6 +81,7 @@ import com.owncloud.android.presentation.ui.files.operations.FileOperation
 import com.owncloud.android.presentation.ui.files.operations.FileOperationsViewModel
 import com.owncloud.android.presentation.ui.security.bayPassUnlockOnce
 import com.owncloud.android.presentation.viewmodels.transfers.TransfersViewModel
+import com.owncloud.android.providers.WorkManagerProvider
 import com.owncloud.android.syncadapter.FileSyncAdapter
 import com.owncloud.android.ui.fragment.FileFragment
 import com.owncloud.android.ui.fragment.TaskRetainerFragment
@@ -242,6 +243,8 @@ class FileDisplayActivity : FileActivity(),
         super.onPostCreate(savedInstanceState)
 
         if (savedInstanceState == null && mAccountWasSet) {
+            val workerProvider = WorkManagerProvider(context = this)
+            workerProvider.enqueueAvailableOfflinePeriodicWorker()
             initAndShowListOfFiles()
         }
 

owncloudData/src/main/java/com/owncloud/android/data/files/datasources/LocalFileDataSource.kt

@@ -41,7 +41,7 @@ interface LocalFileDataSource {
     fun getFilesAvailableOfflineFromAccount(owner: String): List<OCFile>
     fun getFilesAvailableOfflineFromEveryAccount(): List<OCFile>
     fun moveFile(sourceFile: OCFile, targetFolder: OCFile, finalRemotePath: String, finalStoragePath: String)
-    fun saveFilesInFolder(listOfFiles: List<OCFile>, folder: OCFile)
+    fun saveFilesInFolderAndReturnThem(listOfFiles: List<OCFile>, folder: OCFile): List<OCFile>
     fun saveFile(file: OCFile)
     fun removeFile(fileId: Long)
     fun removeFilesForAccount(accountName: String)

owncloudData/src/main/java/com/owncloud/android/data/files/datasources/implementation/OCLocalFileDataSource.kt

@@ -129,12 +129,13 @@ class OCLocalFileDataSource(
             finalStoragePath = sourceFile.storagePath?.let { finalStoragePath }
         )
 
-    override fun saveFilesInFolder(listOfFiles: List<OCFile>, folder: OCFile) {
+    override fun saveFilesInFolderAndReturnThem(listOfFiles: List<OCFile>, folder: OCFile): List<OCFile> {
         // TODO: If it is root, add 0 as parent Id
-        fileDao.insertFilesInFolder(
+        val folderContent = fileDao.insertFilesInFolderAndReturnThem(
             folder = folder.toEntity(),
             folderContent = listOfFiles.map { it.toEntity() }
         )
+        return folderContent.map { it.toModel() }
     }
 
     override fun saveFile(file: OCFile) {

owncloudData/src/main/java/com/owncloud/android/data/files/db/FileDao.kt

@@ -116,12 +116,14 @@ abstract class FileDao {
 
     /**
      * Make sure that the ids are set properly. We don't take care of conflicts and that stuff here.
+     *
+     * return folder content
      */
     @Transaction
-    open fun insertFilesInFolder(
+    open fun insertFilesInFolderAndReturnThem(
         folder: OCFileEntity,
         folderContent: List<OCFileEntity>,
-    ) {
+    ): List<OCFileEntity> {
         val folderId = insert(folder)
 
         folderContent.forEach { fileToInsert ->
@@ -130,6 +132,7 @@ abstract class FileDao {
                 availableOfflineStatus = getNewAvailableOfflineStatus(folder.availableOfflineStatus, fileToInsert.availableOfflineStatus)
             })
         }
+        return getFolderContent(folderId)
     }
 
     @Transaction

owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt

@@ -52,7 +52,7 @@ class OCFileRepository(
             createFullPath = false,
             isChunksFolder = false
         ).also {
-            localFileDataSource.saveFilesInFolder(
+            localFileDataSource.saveFilesInFolderAndReturnThem(
                 folder = parentFolder,
                 listOfFiles = listOf(
                     OCFile(
@@ -270,11 +270,10 @@ class OCFileRepository(
             }
         }
 
-        localFileDataSource.saveFilesInFolder(
+        return localFileDataSource.saveFilesInFolderAndReturnThem(
             folder = remoteFolder,
             listOfFiles = folderContentUpdated
         )
-        return folderContentUpdated
     }
 
     override fun removeFile(listOfFilesToRemove: List<OCFile>, removeOnlyLocalCopy: Boolean) {

owncloudData/src/test/java/com/owncloud/android/data/file/repository/OCFileRepositoryTest.kt

@@ -64,7 +64,7 @@ class OCFileRepositoryTest {
 
         verify(exactly = 1) {
             remoteFileDataSource.createFolder(any(), false, false)
-            localFileDataSource.saveFilesInFolder(any(), OC_FOLDER)
+            localFileDataSource.saveFilesInFolderAndReturnThem(any(), OC_FOLDER)
         }
     }
 
@@ -80,7 +80,7 @@ class OCFileRepositoryTest {
             remoteFileDataSource.createFolder(any(), false, false)
         }
         verify(exactly = 0) {
-            localFileDataSource.saveFilesInFolder(any(), OC_FOLDER)
+            localFileDataSource.saveFilesInFolderAndReturnThem(any(), OC_FOLDER)
         }
     }
 
@@ -203,7 +203,7 @@ class OCFileRepositoryTest {
 
         verify(exactly = 1) {
             remoteFileDataSource.refreshFolder(folderToFetch.remotePath)
-            localFileDataSource.saveFilesInFolder(
+            localFileDataSource.saveFilesInFolderAndReturnThem(
                 listOfFiles = listOfFilesRetrieved.drop(1),
                 folder = listOfFilesRetrieved.first()
             )
@@ -222,7 +222,7 @@ class OCFileRepositoryTest {
             remoteFileDataSource.refreshFolder(OC_FOLDER.remotePath)
         }
         verify(exactly = 0) {
-            localFileDataSource.saveFilesInFolder(any(), any())
+            localFileDataSource.saveFilesInFolderAndReturnThem(any(), any())
         }
     }