handle for single files

Signed-off-by: parneet-guraya <[email protected]>
owncloud · Jan 24, 2024 · a1603be · a1603be
1 parent ff002a3
commit a1603be
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/...dApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/...dApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt
@@ -251,7 +251,7 @@ class FileDetailsFragment : FileFragment() {
             }
 
             R.id.action_remove_file -> {
-                val dialog = RemoveFilesDialogFragment.newInstance(safeFile.file)
+                val dialog = RemoveFilesDialogFragment.newInstance(safeFile.file, safeFile.file.isAvailableLocally)
                 dialog.show(parentFragmentManager, FRAGMENT_TAG_CONFIRMATION)
                 true
             }
@@ -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

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
@@ -473,7 +473,7 @@ class MainFileListFragment : Fragment(),
                                 }
 
                                 FileMenuOption.REMOVE -> {
-                                    val dialogRemove = RemoveFilesDialogFragment.newInstance(file)
+                                    val dialogRemove = RemoveFilesDialogFragment.newInstance(file, file.isAvailableLocally)
                                     dialogRemove.show(requireActivity().supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
                                 }
 
@@ -1095,7 +1095,8 @@ class MainFileListFragment : Fragment(),
             }
 
             R.id.action_remove_file -> {
-                val dialog = RemoveFilesDialogFragment.newInstance(checkedFiles)
+                // to handle using usecase
+                val dialog = RemoveFilesDialogFragment.newInstance(checkedFiles, false)
                 dialog.show(requireActivity().supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
                 fileListAdapter.clearSelection()
                 updateActionModeAfterTogglingSelected()

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt
@@ -260,35 +260,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)
+                val dialog = RemoveFilesDialogFragment.newInstance(file, file.isAvailableLocally)
                 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)
         }
     }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt
@@ -213,35 +213,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)
+                val dialog = RemoveFilesDialogFragment.newInstance(file, file.isAvailableLocally)
                 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)
         }
     }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -412,7 +412,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
             }
             case R.id.action_remove_file: {
-                RemoveFilesDialogFragment dialog = RemoveFilesDialogFragment.newInstanceForSingleFile(getFile());
+                RemoveFilesDialogFragment dialog = RemoveFilesDialogFragment.newInstanceForSingleFile(getFile(), getFile().isAvailableLocally());
                 dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
                 return true;
             }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt
@@ -364,7 +364,7 @@ class PreviewVideoActivity : FileActivity(), Player.Listener, OnPrepareVideoPlay
 
             R.id.action_remove_file -> {
                 player?.pause()
-                val dialog = newInstance(file)
+                val dialog = newInstance(file, file.isAvailableLocally)
                 dialog.show(supportFragmentManager, ConfirmationDialogFragment.FTAG_CONFIRMATION)
                 true
             }