Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
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
Commits
286a4073
Commit
286a4073
authored
5 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Fix UninitializedPropertyAccessException
parent
c08dbb93
No related branches found
No related tags found
1 merge request
!302
Beta fixes
Pipeline
#10777
passed with stage
Stage:
in 26 minutes and 33 seconds
Changes
1
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
+3
-8
3 additions, 8 deletions
...d/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
with
3 additions
and
8 deletions
vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.kt
+
3
−
8
View file @
286a4073
...
...
@@ -62,14 +62,11 @@ import org.videolan.vlc.gui.view.EmptyLoadingState
import
org.videolan.vlc.gui.view.VLCDividerItemDecoration
import
org.videolan.vlc.interfaces.IEventsHandler
import
org.videolan.vlc.interfaces.IRefreshable
import
org.videolan.vlc.media.MediaSessionBrowser.browse
import
org.videolan.vlc.media.MediaUtils
import
org.videolan.vlc.media.MediaUtils.playAll
import
org.videolan.vlc.media.PlaylistManager
import
org.videolan.vlc.repository.BrowserFavRepository
import
org.videolan.vlc.util.*
import
org.videolan.vlc.viewmodels.browser.BrowserModel
import
org.videolan.vlc.viewmodels.browser.IPathOperationDelegate
import
java.util.*
private
const
val
TAG
=
"VLC/BaseBrowserFragment"
...
...
@@ -130,8 +127,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
val
browserShowHiddenFiles
=
menu
.
findItem
(
R
.
id
.
browser_show_hidden_files
)
browserShowHiddenFiles
.
isVisible
=
true
browserShowHiddenFiles
.
isChecked
=
Settings
.
getInstance
(
requireActivity
()).
getBoolean
(
"browser_show_hidden_files"
,
true
)
}
protected
open
fun
defineIsRoot
()
=
mrl
==
null
...
...
@@ -186,7 +181,6 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
viewModel
.
setDestination
(
MediaWrapper
(
Uri
.
parse
(
tag
)))
supportFragmentManager
.
popBackStackImmediate
()
}
}
override
fun
currentContext
()
=
requireContext
()
...
...
@@ -218,7 +212,7 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
}
override
fun
onDestroy
()
{
adapter
.
cancel
()
if
(
::
adapter
.
isInitialized
)
adapter
.
cancel
()
super
.
onDestroy
()
}
...
...
@@ -386,7 +380,8 @@ 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
val
list
=
adapter
.
multiSelectHelper
.
getSelection
()
as
?
List
<
AbstractMediaWrapper
>
?:
return
false
if
(
list
.
isNotEmpty
())
{
when
(
item
.
itemId
)
{
R
.
id
.
action_mode_file_play
->
MediaUtils
.
openList
(
activity
,
list
,
0
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment