Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
16
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
1e8ae7a2
Commit
1e8ae7a2
authored
5 years ago
by
Nicolas Pomepuy
Committed by
Geoffrey Métais
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix auto-reselecting scanned folders in onboarding
parent
375604b3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
+8
-5
8 additions, 5 deletions
...rc/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
with
8 additions
and
5 deletions
vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
+
8
−
5
View file @
1e8ae7a2
...
...
@@ -54,7 +54,6 @@ import org.videolan.vlc.gui.dialogs.showContext
import
org.videolan.vlc.gui.helpers.MedialibraryUtils
import
org.videolan.vlc.gui.helpers.ThreeStatesCheckbox
import
org.videolan.vlc.gui.helpers.UiTools
import
org.videolan.vlc.util.sanitizePath
import
org.videolan.vlc.gui.onboarding.OnboardingActivity
import
org.videolan.vlc.util.*
import
org.videolan.vlc.viewmodels.browser.BrowserModel
...
...
@@ -176,9 +175,13 @@ class StorageBrowserFragment : FileBrowserFragment(), EntryPointsEventsCb, Corou
val
checked
=
tscb
.
state
==
ThreeStatesCheckbox
.
STATE_CHECKED
val
activity
=
requireActivity
()
if
(
activity
is
OnboardingActivity
)
{
if
(
checked
)
MediaParsingService
.
preselectedStorages
.
add
(
mrl
.
sanitizePath
())
else
MediaParsingService
.
preselectedStorages
.
remove
(
mrl
.
sanitizePath
())
val
path
=
mrl
.
sanitizePath
()
if
(
checked
)
{
MediaParsingService
.
preselectedStorages
.
removeAll
{
it
.
startsWith
(
path
)
}
MediaParsingService
.
preselectedStorages
.
add
(
path
)
}
else
{
MediaParsingService
.
preselectedStorages
.
removeAll
{
it
.
startsWith
(
path
)
}
}
}
else
{
if
(
checked
)
{
MedialibraryUtils
.
addDir
(
mrl
,
v
.
context
.
applicationContext
)
...
...
@@ -248,7 +251,7 @@ class StorageBrowserFragment : FileBrowserFragment(), EntryPointsEventsCb, Corou
return
@OnClickListener
}
coroutineScope
.
launch
(
CoroutineExceptionHandler
{
_
,
_
->})
{
coroutineScope
.
launch
(
CoroutineExceptionHandler
{
_
,
_
->
})
{
viewModel
.
addCustomDirectory
(
f
.
canonicalPath
).
join
()
viewModel
.
browserRoot
()
}
...
...
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