Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
246
Issues
246
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLC-Android
Commits
03e21f0c
Commit
03e21f0c
authored
Feb 07, 2019
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix prefetched navigation
parent
d14b4bd4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
...android/src/org/videolan/vlc/providers/BrowserProvider.kt
+4
-0
vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt
...android/src/org/videolan/vlc/providers/NetworkProvider.kt
+7
-0
No files found.
vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
View file @
03e21f0c
...
@@ -258,6 +258,10 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
...
@@ -258,6 +258,10 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
loading
.
value
=
false
loading
.
value
=
false
}
}
protected
fun
getList
(
url
:
String
)
=
prefetchLists
[
url
]
protected
fun
removeList
(
url
:
String
)
=
prefetchLists
.
remove
(
url
)
fun
saveList
(
media
:
MediaWrapper
)
=
foldersContentMap
[
media
]
?.
let
{
if
(!
it
.
isEmpty
())
prefetchLists
[
media
.
location
]
=
it
}
fun
saveList
(
media
:
MediaWrapper
)
=
foldersContentMap
[
media
]
?.
let
{
if
(!
it
.
isEmpty
())
prefetchLists
[
media
.
location
]
=
it
}
fun
isFolderEmpty
(
mw
:
MediaWrapper
)
=
foldersContentMap
[
mw
]
?.
isEmpty
()
?:
true
fun
isFolderEmpty
(
mw
:
MediaWrapper
)
=
foldersContentMap
[
mw
]
?.
isEmpty
()
?:
true
...
...
vlc-android/src/org/videolan/vlc/providers/NetworkProvider.kt
View file @
03e21f0c
...
@@ -49,13 +49,20 @@ class NetworkProvider(context: Context, dataset: LiveDataset<MediaLibraryItem>,
...
@@ -49,13 +49,20 @@ class NetworkProvider(context: Context, dataset: LiveDataset<MediaLibraryItem>,
override
fun
fetch
()
{}
override
fun
fetch
()
{}
override
fun
refresh
():
Boolean
{
override
fun
refresh
():
Boolean
{
val
list
by
lazy
(
LazyThreadSafetyMode
.
NONE
)
{
getList
(
url
!!
)
}
return
if
(
url
==
null
)
{
return
if
(
url
==
null
)
{
dataset
.
value
=
mutableListOf
<
MediaLibraryItem
>().
apply
{
dataset
.
value
=
mutableListOf
<
MediaLibraryItem
>().
apply
{
getFavoritesList
(
favorites
?.
value
)
?.
let
{
addAll
(
it
)
}
getFavoritesList
(
favorites
?.
value
)
?.
let
{
addAll
(
it
)
}
}
}
launch
{
browseRoot
()
}
launch
{
browseRoot
()
}
true
true
}
else
if
(
list
!==
null
)
{
dataset
.
value
=
list
as
MutableList
<
MediaLibraryItem
>
removeList
(
url
)
parseSubDirectories
()
true
}
else
super
.
refresh
()
}
else
super
.
refresh
()
}
}
override
fun
parseSubDirectories
()
{
override
fun
parseSubDirectories
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment