Skip to content
Snippets Groups Projects
Commit f2e3f20f authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Sanity check on action menu events

parent 7708dc65
No related branches found
No related tags found
1 merge request!264Fixes for beta
Pipeline #9793 passed with stage
in 22 minutes and 55 seconds
......@@ -36,6 +36,7 @@ import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.tools.KeyHelper
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.isStarted
import org.videolan.vlc.R
import org.videolan.vlc.gui.browser.MediaBrowserFragment
import org.videolan.vlc.gui.helpers.UiTools
......@@ -169,6 +170,7 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
if (!isStarted()) return false
val selection = multiSelectHelper.getSelection()
if (selection.isNotEmpty()) {
when (item.itemId) {
......
......@@ -275,6 +275,7 @@ open class PlaylistActivity : AudioPlayerContainerActivity(), IEventsHandler, IL
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
if (!isStarted()) return false
val list = audioBrowserAdapter.multiSelectHelper.getSelection()
val tracks = ArrayList<AbstractMediaWrapper>()
for (mediaItem in list)
......
......@@ -217,6 +217,7 @@ abstract class BaseAudioBrowser<T : SortableModel> : MediaBrowserFragment<T>(),
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
if (!isStarted()) return false
val list = getCurrentAdapter()?.multiSelectHelper?.getSelection()
stopActionMode()
if (!list.isNullOrEmpty()) launch {
......
......@@ -41,6 +41,7 @@ import kotlinx.coroutines.*
import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.isStarted
import org.videolan.vlc.R
import org.videolan.vlc.databinding.DirectoryBrowserBinding
import org.videolan.vlc.gui.AudioPlayerContainerActivity
......@@ -350,6 +351,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
if (!isStarted()) return false
val list = adapter.multiSelectHelper.getSelection() as? List<AbstractMediaWrapper> ?: return false
if (list.isNotEmpty()) {
when (item.itemId) {
......
......@@ -12,6 +12,7 @@ import kotlinx.coroutines.*
import kotlinx.coroutines.channels.actor
import org.videolan.medialibrary.interfaces.media.AbstractFolder
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.isStarted
import org.videolan.vlc.R
import org.videolan.vlc.databinding.FoldersFragmentBinding
import org.videolan.vlc.gui.SecondaryActivity
......@@ -158,6 +159,7 @@ class FoldersFragment : MediaBrowserFragment<FoldersViewModel>(), CtxActionRecei
}
override fun onActionItemClicked(mode: ActionMode?, item: MenuItem) : Boolean {
if (!isStarted()) return false
val selection = adapter.multiSelectHelper.getSelection()
when (item.itemId) {
R.id.action_folder_play -> viewModel.playSelection(selection)
......
......@@ -43,6 +43,7 @@ import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
import org.videolan.medialibrary.interfaces.media.AbstractVideoGroup
import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.isStarted
import org.videolan.vlc.R
import org.videolan.vlc.databinding.VideoGridBinding
import org.videolan.vlc.gui.ContentActivity
......@@ -288,6 +289,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
if (!isStarted()) return false
val list = ArrayList<AbstractMediaWrapper>()
for (mw in multiSelectHelper.getSelection()) {
list.add(mw)
......
......@@ -12,6 +12,7 @@ import kotlinx.coroutines.*
import kotlinx.coroutines.channels.actor
import org.videolan.medialibrary.interfaces.media.AbstractVideoGroup
import org.videolan.tools.MultiSelectHelper
import org.videolan.tools.isStarted
import org.videolan.vlc.R
import org.videolan.vlc.databinding.VideogroupsFragmentBinding
import org.videolan.vlc.gui.SecondaryActivity
......@@ -122,6 +123,7 @@ class VideoGroupsFragment : MediaBrowserFragment<VideogroupsViewModel>(), CtxAct
}
override fun onActionItemClicked(mode: ActionMode?, item: MenuItem): Boolean {
if (!isStarted()) return false
val selection = adapter.multiSelectHelper.getSelection()
when (item.itemId) {
R.id.action_folder_play -> viewModel.playSelection(selection)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment