Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
Issue boards
Milestones
Wiki
Code
Merge requests
15
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
72e5f2d9
Commit
72e5f2d9
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Reload library instead of force rescan
Fixes #932 (cherry picked from commit
9dd19a60
)
parent
d4aef069
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
+5
-2
5 additions, 2 deletions
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
+1
-3
1 addition, 3 deletions
vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
with
6 additions
and
5 deletions
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
+
5
−
2
View file @
72e5f2d9
...
...
@@ -36,7 +36,9 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.ObsoleteCoroutinesApi
import
org.videolan.libvlc.util.AndroidUtil
import
org.videolan.medialibrary.interfaces.AbstractMedialibrary
import
org.videolan.vlc.*
import
org.videolan.vlc.BuildConfig
import
org.videolan.vlc.R
import
org.videolan.vlc.StartActivity
import
org.videolan.vlc.extensions.ExtensionManagerService
import
org.videolan.vlc.extensions.ExtensionsManager
import
org.videolan.vlc.gui.audio.AudioBrowserFragment
...
...
@@ -49,6 +51,7 @@ import org.videolan.vlc.gui.video.VideoGridFragment
import
org.videolan.vlc.interfaces.Filterable
import
org.videolan.vlc.interfaces.IRefreshable
import
org.videolan.vlc.media.MediaUtils
import
org.videolan.vlc.reloadLibrary
import
org.videolan.vlc.util.*
private
const
val
TAG
=
"VLC/MainActivity"
...
...
@@ -201,7 +204,7 @@ class MainActivity : ContentActivity(),
if
(
current
!=
null
&&
current
is
IRefreshable
)
(
current
as
IRefreshable
).
refresh
()
else
this
.
rescan
()
reloadLibrary
()
}
}
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
+
1
−
3
View file @
72e5f2d9
...
...
@@ -35,7 +35,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.ObsoleteCoroutinesApi
import
org.videolan.medialibrary.interfaces.AbstractMedialibrary
import
org.videolan.vlc.R
import
org.videolan.vlc.VLCApplication
import
org.videolan.vlc.gui.audio.AudioAlbumsSongsFragment
import
org.videolan.vlc.gui.audio.AudioBrowserFragment
import
org.videolan.vlc.gui.browser.StorageBrowserFragment
...
...
@@ -43,7 +42,6 @@ import org.videolan.vlc.gui.helpers.UiTools
import
org.videolan.vlc.gui.tv.TvUtil
import
org.videolan.vlc.gui.video.VideoGridFragment
import
org.videolan.vlc.reloadLibrary
import
org.videolan.vlc.rescan
import
org.videolan.vlc.util.AndroidDevices
import
org.videolan.vlc.util.KEY_FOLDER
import
org.videolan.vlc.util.RESULT_RESCAN
...
...
@@ -107,7 +105,7 @@ class SecondaryActivity : ContentActivity() {
when
(
item
.
itemId
)
{
R
.
id
.
ml_menu_refresh
->
{
val
ml
=
AbstractMedialibrary
.
getInstance
()
if
(!
ml
.
isWorking
)
this
.
rescan
()
if
(!
ml
.
isWorking
)
reloadLibrary
()
return
true
}
}
...
...
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