Skip to content

Commit a00a765

Browse files
Merge pull request #16869 from nextcloud/backport/16864/stable-33.1.0
[stable-33.1.0] fix(file-actions-bottom-sheet): bundle
2 parents edbb908 + 989bfdb commit a00a765

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import android.view.View
1818
import android.view.ViewGroup
1919
import androidx.annotation.IdRes
2020
import androidx.appcompat.content.res.AppCompatResources
21+
import androidx.core.os.BundleCompat
2122
import androidx.core.os.bundleOf
2223
import androidx.core.view.isEmpty
2324
import androidx.core.view.isVisible
@@ -102,7 +103,9 @@ class FileActionsBottomSheet :
102103

103104
viewModel.load(requireArguments(), componentsGetter)
104105

105-
endpoints = arguments?.getParcelableArrayList(FileActionsViewModel.ARG_ENDPOINTS)
106+
endpoints = arguments?.let { bundle ->
107+
BundleCompat.getParcelableArrayList(bundle, FileActionsViewModel.ARG_ENDPOINTS, Endpoint::class.java)
108+
} ?: mutableListOf()
106109

107110
val bottomSheetDialog = dialog as BottomSheetDialog
108111
bottomSheetDialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
@@ -368,7 +371,7 @@ class FileActionsBottomSheet :
368371
FileActionsViewModel.ARG_FILES to ArrayList<OCFile>(files),
369372
FileActionsViewModel.ARG_IS_OVERFLOW to isOverflow,
370373
FileActionsViewModel.ARG_IN_SINGLE_FILE_FRAGMENT to inSingleFileFragment,
371-
FileActionsViewModel.ARG_ENDPOINTS to endpoints
374+
FileActionsViewModel.ARG_ENDPOINTS to java.util.ArrayList(endpoints)
372375
)
373376
additionalToHide?.let {
374377
argsBundle.putIntArray(FileActionsViewModel.ARG_ADDITIONAL_FILTER, additionalToHide.toIntArray())

0 commit comments

Comments
 (0)