Skip to content
Snippets Groups Projects
Commit 66f5f8e3 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais
Browse files

Fix crash when changing video display in SecondaryActivity

(cherry picked from commit 11fd6f10)
parent 7debef05
No related branches found
No related tags found
No related merge requests found
......@@ -160,6 +160,10 @@ open class ContentActivity : AudioPlayerContainerActivity(), SearchView.OnQueryT
override fun onQueryTextSubmit(query: String) = false
open fun forceLoadVideoFragment() {
throw NotImplementedError("forceLoadVideoFragment not implemented")
}
private fun openSearchActivity() {
startActivity(Intent(Intent.ACTION_SEARCH, null, this, SearchActivity::class.java)
.putExtra(SearchManager.QUERY, searchView.query.toString()))
......
......@@ -83,6 +83,18 @@ class SecondaryActivity : ContentActivity() {
}
}
override fun forceLoadVideoFragment() {
val fragmentId = intent.getStringExtra(KEY_FRAGMENT)
fetchSecondaryFragment(fragmentId)
if (fragment == null) {
finish()
return
}
supportFragmentManager.beginTransaction()
.replace(R.id.fragment_placeholder, fragment!!)
.commit()
}
override fun onResume() {
overridePendingTransition(0, 0)
super.onResume()
......
......@@ -287,17 +287,17 @@ abstract class MediaBrowserFragment<T : SortableModel> : Fragment(), ActionMode.
}
R.id.video_min_group_length_disable -> {
Settings.getInstance(requireActivity()).edit().putString("video_min_group_length", "-1").apply()
(activity as MainActivity).forceLoadVideoFragment()
(activity as ContentActivity).forceLoadVideoFragment()
return true
}
R.id.video_min_group_length_folder -> {
Settings.getInstance(requireActivity()).edit().putString("video_min_group_length", "0").apply()
(activity as MainActivity).forceLoadVideoFragment()
(activity as ContentActivity).forceLoadVideoFragment()
return true
}
R.id.video_min_group_length_name -> {
Settings.getInstance(requireActivity()).edit().putString("video_min_group_length", "6").apply()
(activity as MainActivity).forceLoadVideoFragment()
(activity as ContentActivity).forceLoadVideoFragment()
return true
}
else -> return super.onOptionsItemSelected(item)
......
......@@ -46,6 +46,7 @@ import org.videolan.medialibrary.media.MediaLibraryItem
import org.videolan.tools.MultiSelectHelper
import org.videolan.vlc.R
import org.videolan.vlc.databinding.VideoGridBinding
import org.videolan.vlc.gui.ContentActivity
import org.videolan.vlc.gui.MainActivity
import org.videolan.vlc.gui.SecondaryActivity
import org.videolan.vlc.gui.browser.MediaBrowserFragment
......@@ -133,6 +134,12 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
MediaUtils.loadlastPlaylist(activity, PLAYLIST_TYPE_VIDEO)
true
}
R.id.ml_menu_display_list, R.id.ml_menu_display_grid -> {
val displayInCards = Settings.getInstance(requireActivity()).getBoolean("video_display_in_cards", true)
Settings.getInstance(requireActivity()).edit().putBoolean("video_display_in_cards", !displayInCards).apply()
(activity as ContentActivity).forceLoadVideoFragment()
true
}
else -> super.onOptionsItemSelected(item)
}
}
......
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