Merge pull request #708 from Infomaniak/Fix-MultiSelect-download

Fix MultiSelect download outside of default FileList
Infomaniak · Apr 5, 2022 · 92db39c · 92db39c
2 parents 2ac2597 + c2a6ccc
commit 92db39c
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 113 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FavoritesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FavoritesFragment.kt
@@ -27,7 +27,7 @@ import com.infomaniak.drive.data.cache.FileController
 import com.infomaniak.drive.data.models.BulkOperationType
 import com.infomaniak.drive.data.models.File
 import com.infomaniak.drive.ui.fileList.multiSelect.FavoritesMultiSelectActionsBottomSheetDialog
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
+import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.Utils
 import com.infomaniak.drive.utils.Utils.OTHER_ROOT_ID
 import com.infomaniak.drive.utils.Utils.ROOT_ID
@@ -76,17 +76,14 @@ class FavoritesFragment : FileListFragment() {
         multiSelectLayout?.selectAllButton?.isGone = true
     }
 
-    override fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        FavoritesMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionFavoritesMultiSelectBottomSheetDialog")
+    override fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        super.onMenuButtonClicked(
+            multiSelectBottomSheet = FavoritesMultiSelectActionsBottomSheetDialog(),
+            areAllFromTheSameFolder = false,
+        )
     }
 
     override fun performBulkOperation(

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/FileListFragment.kt
@@ -55,7 +55,6 @@ import com.infomaniak.drive.databinding.MultiSelectLayoutBinding
 import com.infomaniak.drive.ui.bottomSheetDialogs.ColorFolderBottomSheetDialog
 import com.infomaniak.drive.ui.bottomSheetDialogs.FileInfoActionsBottomSheetDialogArgs
 import com.infomaniak.drive.ui.fileList.multiSelect.FileListMultiSelectActionsBottomSheetDialog
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
 import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectFragment
 import com.infomaniak.drive.utils.*
 import com.infomaniak.drive.utils.FilePresenter.openBookmark
@@ -343,7 +342,12 @@ open class FileListFragment : MultiSelectFragment(MATOMO_CATEGORY), SwipeRefresh
             toolbarMultiSelect.setNavigationOnClickListener { closeMultiSelect() }
             moveButtonMultiSelect.setOnClickListener { moveFiles(folderId) }
             deleteButtonMultiSelect.setOnClickListener { deleteFiles(getAllSelectedFilesCount()) }
-            menuButtonMultiSelect.setOnClickListener { onMenuButtonClicked() }
+            menuButtonMultiSelect.setOnClickListener {
+                onMenuButtonClicked(
+                    multiSelectBottomSheet = FileListMultiSelectActionsBottomSheetDialog(),
+                    areAllFromTheSameFolder = true,
+                )
+            }
 
             selectAllButton.apply {
                 initProgress(viewLifecycleOwner)
@@ -662,19 +666,6 @@ open class FileListFragment : MultiSelectFragment(MATOMO_CATEGORY), SwipeRefresh
         }
     }
 
-    protected open fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        FileListMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionFileListMultiSelectBottomSheetDialog")
-    }
-
     override fun performBulkOperation(
         type: BulkOperationType,
         areAllFromTheSameFolder: Boolean,

diff --git a/.../java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt b/.../java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectActionsBottomSheetDialog.kt
@@ -59,7 +59,7 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S
         configureColoredFolder(areIndividualActionsVisible)
         configureAddFavorites(areIndividualActionsVisible)
         configureAvailableOffline()
-        configureDownloadFile()
+        configureDownload()
         configureDuplicateFile()
         configureRestoreFileIn()
         configureRestoreFileToOriginalPlace()
@@ -122,18 +122,18 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S
         onActionSelected(action)
     }
 
-    protected open fun configureDownloadFile() {
+    protected open fun configureDownload() {
         val drivePermissions = DrivePermissions().apply {
             registerPermissions(this@MultiSelectActionsBottomSheetDialog) { authorized ->
-                if (authorized) downloadFileArchive()
+                if (authorized) download()
             }
         }
 
         downloadFile.apply {
             setOnClickListener {
                 if (drivePermissions.checkWriteStoragePermission()) {
                     context?.applicationContext?.trackEvent(matomoCategory, TrackerAction.CLICK, "bulkDownload")
-                    downloadFileArchive()
+                    download()
                 }
             }
 
@@ -157,13 +157,14 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S
         deletePermanently.isGone = true
     }
 
-    private fun downloadFileArchive() {
-
-        fun downloadArchive(fileIds: IntArray) = liveData(Dispatchers.IO) {
-            emit(ApiRepository.getUUIDArchiveFiles(AccountUtils.currentDriveId, fileIds))
-        }
+    private fun download() {
+        if (navigationArgs.areAllFromTheSameFolder) downloadArchive() else downloadFiles()
+    }
 
-        downloadArchive(navigationArgs.fileIds).observe(viewLifecycleOwner) { apiResponse ->
+    private fun downloadArchive() {
+        liveData(Dispatchers.IO) {
+            emit(ApiRepository.getUUIDArchiveFiles(AccountUtils.currentDriveId, navigationArgs.fileIds))
+        }.observe(viewLifecycleOwner) { apiResponse ->
             if (apiResponse.isSuccess()) {
                 apiResponse.data?.let {
                     val downloadURL = Uri.parse(ApiRoutes.downloadArchiveFiles(AccountUtils.currentDriveId, it.uuid))
@@ -176,6 +177,17 @@ abstract class MultiSelectActionsBottomSheetDialog(private val matomoCategory: S
         }
     }
 
+    private fun downloadFiles() {
+        navigationArgs.fileIds.forEach { fileId ->
+            FileController.getFileProxyById(fileId = fileId, customRealm = mainViewModel.realm)?.let { file ->
+                val downloadUrl = Uri.parse(ApiRoutes.downloadFile(file))
+                val fileName = if (file.isFolder()) "${file.name}.zip" else file.name
+                requireContext().startDownloadFile(downloadUrl, fileName)
+            }
+        }
+        onActionSelected()
+    }
+
     fun onActionSelected(type: SelectDialogAction? = null) {
         val finalType = when (type) {
             SelectDialogAction.COLOR_FOLDER -> BulkOperationType.COLOR_FOLDER

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/multiSelect/MultiSelectFragment.kt
@@ -160,6 +160,27 @@ abstract class MultiSelectFragment(private val matomoCategory: String) : Fragmen
         multiSelectLayout?.root?.isGone = true
     }
 
+    open fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        multiSelectBottomSheet.apply {
+            arguments = getMultiSelectBottomSheetArguments(areAllFromTheSameFolder)
+        }.show(childFragmentManager, "MultiSelectActionsBottomSheetDialog")
+    }
+
+    private fun getMultiSelectBottomSheetArguments(areAllFromTheSameFolder: Boolean): Bundle {
+        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
+        return MultiSelectActionsBottomSheetDialogArgs(
+            fileIds = fileIds,
+            onlyFolders = onlyFolders,
+            onlyFavorite = onlyFavorite,
+            onlyOffline = onlyOffline,
+            isAllSelected = isAllSelected,
+            areAllFromTheSameFolder = areAllFromTheSameFolder,
+        ).toBundle()
+    }
+
     fun moveFiles(folderId: Int?) {
         requireContext().moveFileClicked(folderId, selectFolderResultLauncher)
     }

diff --git a/.../com/infomaniak/drive/ui/fileList/multiSelect/TrashMultiSelectActionsBottomSheetDialog.kt b/.../com/infomaniak/drive/ui/fileList/multiSelect/TrashMultiSelectActionsBottomSheetDialog.kt
@@ -36,7 +36,7 @@ class TrashMultiSelectActionsBottomSheetDialog : MultiSelectActionsBottomSheetDi
         availableOffline.isGone = true
     }
 
-    override fun configureDownloadFile() {
+    override fun configureDownload() {
         downloadFile.isGone = true
     }
 

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/MenuPicturesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/MenuPicturesFragment.kt
@@ -28,6 +28,7 @@ import androidx.navigation.fragment.findNavController
 import com.infomaniak.drive.R
 import com.infomaniak.drive.databinding.FragmentMenuPicturesBinding
 import com.infomaniak.drive.databinding.MultiSelectLayoutBinding
+import com.infomaniak.drive.ui.fileList.multiSelect.PicturesMultiSelectActionsBottomSheetDialog
 
 class MenuPicturesFragment : Fragment() {
 
@@ -53,7 +54,12 @@ class MenuPicturesFragment : Fragment() {
         toolbarMultiSelect.setNavigationOnClickListener { closeMultiSelect() }
         moveButtonMultiSelect.setOnClickListener { onMoveButtonClicked() }
         deleteButtonMultiSelect.setOnClickListener { deleteFiles() }
-        menuButtonMultiSelect.setOnClickListener { onMenuButtonClicked() }
+        menuButtonMultiSelect.setOnClickListener {
+            onMenuButtonClicked(
+                multiSelectBottomSheet = PicturesMultiSelectActionsBottomSheetDialog(),
+                areAllFromTheSameFolder = false,
+            )
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/MySharesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/MySharesFragment.kt
@@ -23,7 +23,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.infomaniak.drive.R
 import com.infomaniak.drive.data.cache.FileController
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
+import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.ui.fileList.multiSelect.MySharesMultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.Utils
 import com.infomaniak.drive.utils.Utils.OTHER_ROOT_ID
@@ -69,17 +69,14 @@ class MySharesFragment : FileSubTypeListFragment() {
         }
     }
 
-    override fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        MySharesMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionMySharesMultiSelectBottomSheetDialog")
+    override fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        super.onMenuButtonClicked(
+            multiSelectBottomSheet = MySharesMultiSelectActionsBottomSheetDialog(),
+            areAllFromTheSameFolder = false,
+        )
     }
 
     companion object {

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/OfflineFileFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/OfflineFileFragment.kt
@@ -21,7 +21,7 @@ import android.os.Bundle
 import android.view.View
 import com.infomaniak.drive.R
 import com.infomaniak.drive.data.cache.FileController
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
+import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.ui.fileList.multiSelect.OfflineMultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.Utils
 import kotlinx.android.synthetic.main.fragment_file_list.*
@@ -44,17 +44,14 @@ open class OfflineFileFragment : FileSubTypeListFragment() {
         folderId = Utils.OTHER_ROOT_ID
     }
 
-    override fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        OfflineMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionOfflineMultiSelectBottomSheetDialog")
+    override fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        super.onMenuButtonClicked(
+            multiSelectBottomSheet = OfflineMultiSelectActionsBottomSheetDialog(),
+            areAllFromTheSameFolder = false,
+        )
     }
 
     companion object {

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/PicturesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/PicturesFragment.kt
@@ -38,9 +38,7 @@ import com.infomaniak.drive.data.models.*
 import com.infomaniak.drive.data.services.DownloadWorker
 import com.infomaniak.drive.databinding.FragmentMenuPicturesBinding
 import com.infomaniak.drive.databinding.MultiSelectLayoutBinding
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
 import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectFragment
-import com.infomaniak.drive.ui.fileList.multiSelect.PicturesMultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.*
 import com.infomaniak.lib.core.utils.Utils.createRefreshTimer
 import com.infomaniak.lib.core.utils.setPagination
@@ -238,18 +236,6 @@ class PicturesFragment : MultiSelectFragment(MATOMO_CATEGORY) {
         moveFiles(folderId)
     }
 
-    fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline) = multiSelectManager.getMenuNavArgs()
-        PicturesMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-            ).toBundle()
-        }.show(childFragmentManager, "ActionPicturesMultiSelectBottomSheetDialog")
-    }
-
     override fun performBulkOperation(
         type: BulkOperationType,
         areAllFromTheSameFolder: Boolean,

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/RecentChangesFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/RecentChangesFragment.kt
@@ -24,7 +24,7 @@ import androidx.fragment.app.viewModels
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.infomaniak.drive.R
 import com.infomaniak.drive.data.cache.FileController
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
+import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.ui.fileList.multiSelect.RecentChangesMultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.AccountUtils
 import com.infomaniak.drive.utils.Utils
@@ -63,17 +63,14 @@ class RecentChangesFragment : FileSubTypeListFragment() {
         folderId = Utils.OTHER_ROOT_ID
     }
 
-    override fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        RecentChangesMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionRecentChangesMultiSelectBottomSheetDialog")
+    override fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        super.onMenuButtonClicked(
+            multiSelectBottomSheet = RecentChangesMultiSelectActionsBottomSheetDialog(),
+            areAllFromTheSameFolder = false,
+        )
     }
 
     companion object {

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/SharedWithMeFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/SharedWithMeFragment.kt
@@ -31,7 +31,7 @@ import com.infomaniak.drive.data.cache.FileController
 import com.infomaniak.drive.data.models.File
 import com.infomaniak.drive.data.models.UserDrive
 import com.infomaniak.drive.ui.bottomSheetDialogs.DriveMaintenanceBottomSheetDialog
-import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialogArgs
+import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.ui.fileList.multiSelect.SharedWithMeMultiSelectActionsBottomSheetDialog
 import com.infomaniak.drive.utils.AccountUtils
 import com.infomaniak.drive.utils.Utils
@@ -125,17 +125,14 @@ class SharedWithMeFragment : FileSubTypeListFragment() {
         }
     }
 
-    override fun onMenuButtonClicked() {
-        val (fileIds, onlyFolders, onlyFavorite, onlyOffline, isAllSelected) = multiSelectManager.getMenuNavArgs()
-        SharedWithMeMultiSelectActionsBottomSheetDialog().apply {
-            arguments = MultiSelectActionsBottomSheetDialogArgs(
-                fileIds = fileIds,
-                onlyFolders = onlyFolders,
-                onlyFavorite = onlyFavorite,
-                onlyOffline = onlyOffline,
-                isAllSelected = isAllSelected
-            ).toBundle()
-        }.show(childFragmentManager, "ActionSharedWithMeMultiSelectBottomSheetDialog")
+    override fun onMenuButtonClicked(
+        multiSelectBottomSheet: MultiSelectActionsBottomSheetDialog,
+        areAllFromTheSameFolder: Boolean,
+    ) {
+        super.onMenuButtonClicked(
+            multiSelectBottomSheet = SharedWithMeMultiSelectActionsBottomSheetDialog(),
+            areAllFromTheSameFolder = false,
+        )
     }
 
     companion object {