[Android] Fix crash when rotating while AddToGroupDialog is opened
Nicolas Pomepuy
git at videolan.org
Mon Feb 10 14:09:43 UTC 2025
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Mon Jan 27 11:53:29 2025 +0100| [5293609ad8c21b2dc6338b378e8782597432d659] | committer: Nicolas Pomepuy
Fix crash when rotating while AddToGroupDialog is opened
> https://code.videolan.org/videolan/vlc-android/commit/5293609ad8c21b2dc6338b378e8782597432d659
---
.../videolan/vlc/gui/dialogs/AddToGroupDialog.kt | 7 ++++--
.../src/org/videolan/vlc/gui/helpers/UiTools.kt | 3 +--
.../videolan/vlc/gui/video/VideoGridFragment.kt | 28 +++++++++++++---------
3 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AddToGroupDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AddToGroupDialog.kt
index 1139f90d13..825ac2f7db 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AddToGroupDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/AddToGroupDialog.kt
@@ -28,6 +28,8 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
@@ -50,6 +52,8 @@ import org.videolan.vlc.viewmodels.mobile.VideoGroupingType
import org.videolan.vlc.viewmodels.mobile.VideosViewModel
import java.util.*
+const val CONFIRM_ADD_TO_GROUP_RESULT = "CONFIRM_ADD_TO_GROUP_RESULT"
+
class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHandler {
override fun getDefaultState(): Int = STATE_EXPANDED
@@ -57,7 +61,6 @@ class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHand
private lateinit var viewModel: VideosViewModel
private var forbidNewGroup: Boolean = true
- lateinit var newGroupListener: () -> Unit
private var isLoading: Boolean = false
set(value) {
field = value
@@ -157,7 +160,7 @@ class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHand
override fun onClick(item: MediaLibraryItem, position: Int) {
when (item) {
is DummyItem -> {
- newGroupListener.invoke()
+ setFragmentResult(CONFIRM_ADD_TO_GROUP_RESULT, bundleOf(KEY_TRACKS to newTrack))
dismiss()
}
else -> addToGroup(item as VideoGroup)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
index 8f47f41f72..916321ce31 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/UiTools.kt
@@ -544,12 +544,11 @@ object UiTools {
return false
}
- fun FragmentActivity.addToGroup(tracks: List<MediaWrapper>, forbidNewGroup:Boolean , newGroupListener: ()->Unit) {
+ fun FragmentActivity.addToGroup(tracks: List<MediaWrapper>, forbidNewGroup:Boolean) {
if (!isStarted()) return
val addToGroupDialog = AddToGroupDialog()
addToGroupDialog.arguments = bundleOf(AddToGroupDialog.KEY_TRACKS to tracks.toTypedArray(), AddToGroupDialog.FORBID_NEW_GROUP to forbidNewGroup)
addToGroupDialog.show(supportFragmentManager, "fragment_add_to_group")
- addToGroupDialog.newGroupListener = newGroupListener
}
/**
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
index 172ad2fe36..a8aef04a83 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
@@ -68,6 +68,8 @@ import org.videolan.resources.MOVIEPEDIA_MEDIA
import org.videolan.resources.PLAYLIST_TYPE_VIDEO
import org.videolan.resources.UPDATE_SEEN
import org.videolan.resources.util.parcelable
+import org.videolan.resources.util.parcelableArray
+import org.videolan.resources.util.parcelableList
import org.videolan.resources.util.waitForML
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.PLAYBACK_HISTORY
@@ -81,6 +83,8 @@ import org.videolan.vlc.R
import org.videolan.vlc.databinding.VideoGridBinding
import org.videolan.vlc.gui.SecondaryActivity
import org.videolan.vlc.gui.browser.MediaBrowserFragment
+import org.videolan.vlc.gui.dialogs.AddToGroupDialog
+import org.videolan.vlc.gui.dialogs.CONFIRM_ADD_TO_GROUP_RESULT
import org.videolan.vlc.gui.dialogs.CONFIRM_PERMISSION_CHANGED
import org.videolan.vlc.gui.dialogs.CURRENT_SORT
import org.videolan.vlc.gui.dialogs.CtxActionReceiver
@@ -316,6 +320,16 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
binding.fastScroller.setRecyclerView(binding.videoGrid, viewModel.provider)
(parentFragment as? VideoBrowserFragment)?.videoGridOnlyFavorites = viewModel.provider.onlyFavorites
+ requireActivity().supportFragmentManager.setFragmentResultListener(CONFIRM_ADD_TO_GROUP_RESULT, viewLifecycleOwner) { requestKey, bundle ->
+ lifecycleScope.launch {
+ val selection = bundle.parcelableArray<MediaWrapper>(AddToGroupDialog.KEY_TRACKS) ?: arrayOf()
+ viewModel.createGroup(selection.toList())?.let {
+ // we already are in a group. Finishing to avoid stacking multiple group activities
+ if (viewModel.groupingType == VideoGroupingType.NONE) requireActivity().finish()
+ activity?.open(it)
+ }
+ }
+ }
requireActivity().supportFragmentManager.setFragmentResultListener(CONFIRM_PERMISSION_CHANGED, viewLifecycleOwner) { requestKey, bundle ->
val changed = bundle.getBoolean(KEY_PERMISSION_CHANGED)
if (changed) viewModel.refresh()
@@ -560,15 +574,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
}
private fun addToGroup(selection: List<MediaLibraryItem>) {
- requireActivity().addToGroup(selection.getAll(), selection.size == 1) {
- lifecycleScope.launch {
- viewModel.createGroup(selection.getAll())?.let {
- // we already are in a group. Finishing to avoid stacking multiple group activities
- if (viewModel.groupingType == VideoGroupingType.NONE) requireActivity().finish()
- activity?.open(it)
- }
- }
- }
+ requireActivity().addToGroup(selection.getAll(), selection.size == 1)
}
override fun onDestroyActionMode(mode: ActionMode) {
@@ -608,7 +614,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
}
CTX_SHARE -> lifecycleScope.launch { (requireActivity() as AppCompatActivity).share(media) }
CTX_REMOVE_GROUP -> viewModel.removeFromGroup(media)
- CTX_ADD_GROUP -> requireActivity().addToGroup(listOf(media), true) {}
+ CTX_ADD_GROUP -> requireActivity().addToGroup(listOf(media), true)
CTX_GROUP_SIMILAR -> lifecycleScope.launch { if (!requireActivity().showPinIfNeeded()) viewModel.groupSimilar(media) }
CTX_MARK_AS_PLAYED -> lifecycleScope.launch { viewModel.markAsPlayed(media) }
CTX_MARK_AS_UNPLAYED -> lifecycleScope.launch { viewModel.markAsUnplayed(media) }
@@ -640,7 +646,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
CTX_UNGROUP -> lifecycleScope.launch { if (!requireActivity().showPinIfNeeded()) viewModel.ungroup(media) }
CTX_MARK_ALL_AS_PLAYED -> lifecycleScope.launch { viewModel.markAsPlayed(media) }
CTX_MARK_ALL_AS_UNPLAYED -> lifecycleScope.launch { viewModel.markAsUnplayed(media) }
- CTX_ADD_GROUP -> requireActivity().addToGroup(listOf(media).getAll(), true) {}
+ CTX_ADD_GROUP -> requireActivity().addToGroup(listOf(media).getAll(), true)
CTX_FAV_ADD, CTX_FAV_REMOVE -> lifecycleScope.launch(Dispatchers.IO) {
media.isFavorite = option == CTX_FAV_ADD
}
More information about the Android
mailing list