Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Geoffrey Métais
VLC-Android
Commits
ad358914
Commit
ad358914
authored
May 05, 2020
by
Geoffrey Métais
Browse files
Fix loading state toggling
parent
33a0631b
Pipeline
#16968
passed with stage
in 3 minutes and 38 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
application/vlc-android/src/org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt
View file @
ad358914
...
...
@@ -44,7 +44,7 @@ abstract class MedialibraryProvider<T : MediaLibraryItem>(val context: Context,
private
lateinit
var
dataSource
:
DataSource
<
Int
,
T
>
val
loading
=
MutableLiveData
<
Boolean
>().
apply
{
value
=
true
}
private
var
refreshDeferred
:
CompletableDeferred
<
Unit
>?
=
null
var
isRefreshing
=
medialibrary
.
isWorking
var
isRefreshing
=
true
private
set
(
value
)
{
refreshDeferred
=
if
(
value
)
CompletableDeferred
()
else
{
...
...
@@ -95,7 +95,7 @@ abstract class MedialibraryProvider<T : MediaLibraryItem>(val context: Context,
}
fun
refresh
():
Boolean
{
if
(
isRefresh
ing
||
!
medialibrary
.
isStarted
||
!
this
::
dataSource
.
isInitialized
)
return
false
if
(
medialibrary
.
isWork
ing
||
!
medialibrary
.
isStarted
||
!
this
::
dataSource
.
isInitialized
)
return
false
privateHeaders
.
clear
()
if
(!
dataSource
.
isInvalid
)
{
isRefreshing
=
true
...
...
@@ -128,7 +128,7 @@ abstract class MedialibraryProvider<T : MediaLibraryItem>(val context: Context,
try
{
callback
.
onResult
(
page
.
toList
(),
params
.
requestedStartPosition
,
count
)
}
catch
(
e
:
IllegalArgumentException
)
{}
isRefreshing
=
false
isRefreshing
=
!
medialibrary
.
isStarted
}
override
fun
loadRange
(
params
:
LoadRangeParams
,
callback
:
LoadRangeCallback
<
T
>)
{
...
...
Write
Preview
Supports
Markdown
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