[FEATURE REQUEST] Folder with "Local only" remove option

changelog/unreleased/4289

@@ -0,0 +1,6 @@
+Enhancement: Correct "Local only" option in remove dialog
+
+"Local only" option in remove dialog will only be shown if checking selected files and folders recursively, at least one file is available locally.
+
+https://github.com/owncloud/android/issues/3936
+https://github.com/owncloud/android/pull/4289

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt

@@ -60,6 +60,7 @@ import com.owncloud.android.domain.files.usecases.GetFileByRemotePathUseCase
 import com.owncloud.android.domain.files.usecases.GetFileWithSyncInfoByIdUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderContentAsStreamUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderContentUseCase
+import com.owncloud.android.domain.files.usecases.IsAnyFileAvailableLocallyUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderImagesUseCase
 import com.owncloud.android.domain.files.usecases.GetPersonalRootFolderForAccountUseCase
 import com.owncloud.android.domain.files.usecases.GetSearchFolderContentUseCase
@@ -166,6 +167,7 @@ val useCaseModule = module {
     factoryOf(::GetFolderContentAsStreamUseCase)
     factoryOf(::GetFolderContentUseCase)
     factoryOf(::GetFolderImagesUseCase)
+    factoryOf(::IsAnyFileAvailableLocallyUseCase)
     factoryOf(::GetPersonalRootFolderForAccountUseCase)
     factoryOf(::GetSearchFolderContentUseCase)
     factoryOf(::GetSharedByLinkForAccountAsStreamUseCase)

owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt

@@ -30,6 +30,7 @@ import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.providers.ContextProvider
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -117,6 +118,43 @@ object ViewModelExt : KoinComponent {
         }
     }
 
+    fun <T, Params> ViewModel.runUseCaseWithResult(
+        coroutineDispatcher: CoroutineDispatcher,
+        requiresConnection: Boolean = true,
+        showLoading: Boolean = false,
+        sharedFlow: MutableSharedFlow<UIResult<T>>,
+        useCase: BaseUseCaseWithResult<T, Params>,
+        useCaseParams: Params,
+        postSuccess: Boolean = true,
+        postSuccessWithData: Boolean = true
+    ) {
+        viewModelScope.launch(coroutineDispatcher) {
+            if (showLoading) {
+                sharedFlow.emit(UIResult.Loading())
+            }
+
+            // If use case requires connection and is not connected, it is not needed to execute use case
+            if (requiresConnection and !contextProvider.isConnected()) {
+                sharedFlow.emit(UIResult.Error(error = NoNetworkConnectionException()))
+                Timber.w("${useCase.javaClass.simpleName} will not be executed due to lack of network connection")
+                return@launch
+            }
+
+            val useCaseResult = useCase(useCaseParams)
+            Timber.d("Use case executed: ${useCase.javaClass.simpleName} with result: $useCaseResult")
+
+            if (useCaseResult.isSuccess && postSuccess) {
+                if (postSuccessWithData) {
+                    sharedFlow.emit(UIResult.Success(useCaseResult.getDataOrNull()))
+                } else {
+                    sharedFlow.emit(UIResult.Success())
+                }
+            } else if (useCaseResult.isError) {
+                sharedFlow.emit(UIResult.Error(error = useCaseResult.getThrowableOrNull()))
+            }
+        }
+    }
+
     fun <T, U, Params> ViewModel.runUseCaseWithResultAndUseCachedData(
         coroutineDispatcher: CoroutineDispatcher,
         requiresConnection: Boolean = true,

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

@@ -353,7 +353,7 @@ class FileDetailsFragment : FileFragment() {
         thumbnailImageView.bringToFront()
         thumbnailImageView.isVisible = false
 
-        val file =  ocFileWithSyncInfo.file
+        val file = ocFileWithSyncInfo.file
         if (ocFileWithSyncInfo.isSynchronizing) {
             thumbnailImageView.setImageResource(R.drawable.sync_pin)
             thumbnailImageView.visibility = View.VISIBLE

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt

@@ -156,6 +156,7 @@ class MainFileListFragment : Fragment(),
 
     private var menu: Menu? = null
     private var checkedFiles: List<OCFile> = emptyList()
+    private var filesToRemove: List<OCFile> = emptyList()
     private var fileSingleFile: OCFile? = null
     private var fileOptionsBottomSheetSingleFileLayout: LinearLayout? = null
     private var succeededTransfers: List<OCTransfer>? = null
@@ -474,8 +475,8 @@ class MainFileListFragment : Fragment(),
                                 }
 
                                 FileMenuOption.REMOVE -> {
-                                    val dialogRemove = RemoveFilesDialogFragment.newInstance(file)
-                                    dialogRemove.show(requireActivity().supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
+                                    filesToRemove = listOf(file)
+                                    fileOperationsViewModel.showRemoveDialog(filesToRemove)
                                 }
 
                                 FileMenuOption.OPEN_WITH -> {
@@ -621,6 +622,22 @@ class MainFileListFragment : Fragment(),
             }
         }
 
+        collectLatestLifecycleFlow(fileOperationsViewModel.checkIfFileLocalSharedFlow) {
+            val fileActivity = (requireActivity() as FileActivity)
+            when (it) {
+                is UIResult.Loading -> fileActivity.showLoadingDialog(R.string.common_loading)
+                is UIResult.Success -> {
+                    fileActivity.dismissLoadingDialog()
+                    it.data?.let { result -> onShowRemoveDialog(filesToRemove, result) }
+                }
+
+                is UIResult.Error -> {
+                    fileActivity.dismissLoadingDialog()
+                    showMessageInSnackbar(resources.getString(R.string.common_error_unknown))
+                }
+            }
+        }
+
         /* TransfersViewModel observables */
         observeTransfers()
 
@@ -938,6 +955,13 @@ class MainFileListFragment : Fragment(),
         }
     }
 
+    private fun onShowRemoveDialog(filesToRemove: List<OCFile>, isLocal: Boolean) {
+        val dialog = RemoveFilesDialogFragment.newInstance(ArrayList(filesToRemove), isLocal)
+        dialog.show(requireActivity().supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
+        fileListAdapter.clearSelection()
+        updateActionModeAfterTogglingSelected()
+    }
+
     override fun onFolderNameSet(newFolderName: String, parentFolder: OCFile) {
         fileOperationsViewModel.performOperation(FileOperation.CreateFolder(newFolderName, parentFolder))
         fileOperationsViewModel.createFolder.observe(viewLifecycleOwner, Event.EventObserver { uiResult: UIResult<Unit> ->
@@ -1099,10 +1123,8 @@ class MainFileListFragment : Fragment(),
             }
 
             R.id.action_remove_file -> {
-                val dialog = RemoveFilesDialogFragment.newInstance(checkedFiles)
-                dialog.show(requireActivity().supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
-                fileListAdapter.clearSelection()
-                updateActionModeAfterTogglingSelected()
+                filesToRemove = checkedFiles
+                fileOperationsViewModel.showRemoveDialog(filesToRemove)
                 return true
             }
 

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

@@ -36,6 +36,7 @@ import com.owncloud.android.domain.exceptions.NoNetworkConnectionException
 import com.owncloud.android.domain.files.model.OCFile
 import com.owncloud.android.domain.files.usecases.CopyFileUseCase
 import com.owncloud.android.domain.files.usecases.CreateFolderAsyncUseCase
+import com.owncloud.android.domain.files.usecases.IsAnyFileAvailableLocallyUseCase
 import com.owncloud.android.domain.files.usecases.ManageDeepLinkUseCase
 import com.owncloud.android.domain.files.usecases.MoveFileUseCase
 import com.owncloud.android.domain.files.usecases.RemoveFileUseCase
@@ -49,7 +50,9 @@ import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import com.owncloud.android.ui.dialog.FileAlreadyExistsDialog
 import com.owncloud.android.usecases.synchronization.SynchronizeFileUseCase
 import com.owncloud.android.usecases.synchronization.SynchronizeFolderUseCase
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -68,6 +71,7 @@ class FileOperationsViewModel(
     private val unsetFilesAsAvailableOfflineUseCase: UnsetFilesAsAvailableOfflineUseCase,
     private val manageDeepLinkUseCase: ManageDeepLinkUseCase,
     private val setLastUsageFileUseCase: SetLastUsageFileUseCase,
+    private val isAnyFileAvailableLocallyUseCase: IsAnyFileAvailableLocallyUseCase,
     private val contextProvider: ContextProvider,
     private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
 ) : ViewModel() {
@@ -102,6 +106,9 @@ class FileOperationsViewModel(
     private val _deepLinkFlow = MutableStateFlow<Event<UIResult<OCFile?>>?>(null)
     val deepLinkFlow: StateFlow<Event<UIResult<OCFile?>>?> = _deepLinkFlow
 
+    private val _checkIfFileLocalSharedFlow = MutableSharedFlow<UIResult<Boolean>>()
+    val checkIfFileLocalSharedFlow: SharedFlow<UIResult<Boolean>> = _checkIfFileLocalSharedFlow
+
     val openDialogs = mutableListOf<FileAlreadyExistsDialog>()
 
     // Used to save the last operation folder
@@ -123,6 +130,17 @@ class FileOperationsViewModel(
         }
     }
 
+    fun showRemoveDialog(filesToRemove: List<OCFile>) {
+        runUseCaseWithResult(
+            coroutineDispatcher = coroutinesDispatcherProvider.io,
+            showLoading = true,
+            sharedFlow = _checkIfFileLocalSharedFlow,
+            useCase = isAnyFileAvailableLocallyUseCase,
+            useCaseParams = IsAnyFileAvailableLocallyUseCase.Params(filesToRemove),
+            requiresConnection = false
+        )
+    }
+
     fun setLastUsageFile(file: OCFile) {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             setLastUsageFileUseCase(

owncloudApp/src/main/java/com/owncloud/android/presentation/files/removefile/RemoveFilesDialogFragment.kt

@@ -77,22 +77,19 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
          * @return Dialog ready to show.
          */
         @JvmStatic
-        fun newInstance(files: ArrayList<OCFile>): RemoveFilesDialogFragment {
+        fun newInstance(files: ArrayList<OCFile>, isAvailableLocally: Boolean): RemoveFilesDialogFragment {
             val messageStringId: Int
             var containsFolder = false
-            var containsDown = false
             var containsAvailableOffline = false
             for (file in files) {
                 if (file.isFolder) {
                     containsFolder = true
                 }
-                if (file.isAvailableLocally) {
-                    containsDown = true
-                }
                 if (file.isAvailableOffline) {
                     containsAvailableOffline = true
                 }
             }
+
             messageStringId = if (files.size == 1) {
                 // choose message for a single file
                 val file = files.first()
@@ -109,7 +106,7 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
                     R.string.confirmation_remove_files_alert
                 }
             }
-            val localRemoveButton = if (!containsAvailableOffline && (containsFolder || containsDown)) {
+            val localRemoveButton = if (!containsAvailableOffline && isAvailableLocally) {
                 R.string.confirmation_remove_local
             } else {
                 -1
@@ -140,7 +137,7 @@ class RemoveFilesDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
         @JvmStatic
         @JvmName("newInstanceForSingleFile")
         fun newInstance(file: OCFile): RemoveFilesDialogFragment {
-            return newInstance(arrayListOf(file))
+            return newInstance(arrayListOf(file), file.isAvailableLocally)
         }
     }
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt

@@ -75,6 +75,11 @@ class ReleaseNotesViewModel(
                 subtitle = R.string.release_notes_4_3_0_subtitle_6,
                 type = ReleaseNoteType.ENHANCEMENT,
             ),
+            ReleaseNote(
+                title = R.string.release_notes_4_3_0_title_7,
+                subtitle = R.string.release_notes_4_3_0_subtitle_7,
+                type = ReleaseNoteType.ENHANCEMENT
+            )
         )
     }
 }

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt

@@ -263,35 +263,43 @@ class PreviewAudioFragment : FileFragment() {
                 mContainerActivity.fileOperationsHelper.showShareFile(file)
                 true
             }
+
             R.id.action_open_file_with -> {
                 openFile()
                 true
             }
+
             R.id.action_remove_file -> {
                 val dialog = RemoveFilesDialogFragment.newInstance(file)
                 dialog.show(parentFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
                 true
             }
+
             R.id.action_see_details -> {
                 seeDetails()
                 true
             }
+
             R.id.action_send_file -> {
                 requireActivity().sendDownloadedFilesByShareSheet(listOf(file))
                 true
             }
+
             R.id.action_sync_file -> {
                 mContainerActivity.fileOperationsHelper.syncFile(file)
                 true
             }
+
             R.id.action_set_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.SetFilesAsAvailableOffline(listOf(file)))
                 true
             }
+
             R.id.action_unset_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.UnsetFilesAsAvailableOffline(listOf(file)))
                 true
             }
+
             else -> super.onOptionsItemSelected(item)
         }
     }

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

@@ -216,35 +216,43 @@ class PreviewImageFragment : FileFragment() {
                 mContainerActivity.fileOperationsHelper.showShareFile(file)
                 true
             }
+
             R.id.action_open_file_with -> {
                 openFile()
                 true
             }
+
             R.id.action_remove_file -> {
                 val dialog = RemoveFilesDialogFragment.newInstance(file)
                 dialog.show(requireFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION)
                 true
             }
+
             R.id.action_see_details -> {
                 seeDetails()
                 true
             }
+
             R.id.action_send_file -> {
                 requireActivity().sendDownloadedFilesByShareSheet(listOf(file))
                 true
             }
+
             R.id.action_sync_file -> {
                 mContainerActivity.fileOperationsHelper.syncFile(file)
                 true
             }
+
             R.id.action_set_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.SetFilesAsAvailableOffline(listOf(file)))
                 true
             }
+
             R.id.action_unset_available_offline -> {
                 fileOperationsViewModel.performOperation(FileOperation.UnsetFilesAsAvailableOffline(listOf(file)))
                 true
             }
+
             else -> super.onOptionsItemSelected(item)
         }
     }

owncloudApp/src/main/res/values/strings.xml

@@ -739,6 +739,8 @@
     <string name="release_notes_4_3_0_subtitle_5">The lens icon in the toolbar was removed when listing spaces in folder picker</string>
     <string name="release_notes_4_3_0_title_6">Add warning in http connections</string>
     <string name="release_notes_4_3_0_subtitle_6">Added a warning dialog in the login view when it is a http connection</string>
+    <string name="release_notes_4_3_0_title_7">Correct \"Local only\" option in remove dialog</string>
+    <string name="release_notes_4_3_0_subtitle_7">\"Local only\" option in remove dialog will only be shown if checking selected files and folders recursively, at least one file is available locally</string>
 
     <!-- Open in web -->
     <string name="ic_action_open_in_web">Open in web</string>