Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
534
Issue boards
Milestones
Wiki
Code
Merge requests
10
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Merge requests
!611
Fix group / folder opening issue
代码
评审变更
检出分支
下载
补丁
文本差异
Merged
Fix group / folder opening issue
Aza/vlc-android:beta_fixes
into
master
Overview
0
Commits
4
Pipelines
5
Changes
4
Merged
Nicolas Pomepuy
requested to merge
Aza/vlc-android:beta_fixes
into
master
4 years ago
Overview
0
Commits
4
Pipelines
5
Changes
4
Expand
0
0
Merge request reports
Compare
master
version 4
29c80fb6
4 years ago
version 3
01125150
4 years ago
version 2
4a144b47
4 years ago
version 1
d2ce49cc
4 years ago
master (base)
and
latest version
latest version
090e5822
4 commits,
4 years ago
version 4
29c80fb6
4 commits,
4 years ago
version 3
01125150
3 commits,
4 years ago
version 2
4a144b47
2 commits,
4 years ago
version 1
d2ce49cc
1 commit,
4 years ago
4 files
+
6
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
+
1
−
1
Options
@@ -100,7 +100,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
else
arguments
?.
getParcelable
(
KEY_FOLDER
)
val
parentGroup
=
if
(
savedInstanceState
!=
null
)
savedInstanceState
.
getParcelable
<
VideoGroup
>(
KEY_GROUP
)
else
arguments
?.
getParcelable
(
KEY_GROUP
)
val
grouping
=
when
(
Settings
.
getInstance
(
requireContext
()).
getString
(
KEY_GROUP_VIDEOS
,
null
)
?:
GROUP_VIDEOS_NAME
)
{
val
grouping
=
if
(
parentGroup
!=
null
||
folder
!=
null
)
VideoGroupingType
.
NONE
else
when
(
Settings
.
getInstance
(
requireContext
()).
getString
(
KEY_GROUP_VIDEOS
,
null
)
?:
GROUP_VIDEOS_NAME
)
{
GROUP_VIDEOS_NONE
->
VideoGroupingType
.
NONE
GROUP_VIDEOS_FOLDER
->
VideoGroupingType
.
FOLDER
else
->
VideoGroupingType
.
NAME
Loading