Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-Android
Commits
d8108551
Commit
d8108551
authored
Aug 07, 2019
by
Shivansh Saini
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed playlist duplicate by name bug
Signed-off-by:
Shivansh Saini
<
shivanshs9@gmail.com
>
parent
602770dd
Pipeline
#8723
passed with stage
in 4 minutes and 21 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.kt
...id/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.kt
+7
-4
No files found.
vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.kt
View file @
d8108551
...
...
@@ -60,7 +60,7 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
private
lateinit
var
tracks
:
Array
<
AbstractMediaWrapper
>
private
lateinit
var
newTrack
:
Array
<
AbstractMediaWrapper
>
private
lateinit
var
medialibrary
:
AbstractMedialibrary
private
var
playlist
Id
:
Long
=
0
private
var
playlist
:
AbstractPlaylist
?
=
null
override
fun
initialFocusedView
():
View
=
listView
...
...
@@ -124,10 +124,11 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
runIO
(
Runnable
{
val
name
=
editText
!!
.
text
.
toString
().
trim
{
it
<=
' '
}
val
addTracks
=
!
Tools
.
isArrayEmpty
(
newTrack
)
var
playlist
:
AbstractPlaylist
?
=
medialibrary
.
getPlaylist
(
playlist
Id
)
var
playlist
:
AbstractPlaylist
?
=
if
(
playlist
!=
null
&&
playlist
!!
.
title
==
name
)
medialibrary
.
getPlaylist
(
playlist
!!
.
id
)
else
null
val
exists
=
playlist
!=
null
val
playlistTracks
:
Array
<
AbstractMediaWrapper
>?
if
(!
exists
)
playlist
=
medialibrary
.
createPlaylist
(
name
)
if
(!
exists
)
playlist
=
medialibrary
.
getPlaylistByName
(
name
)
if
(
playlist
==
null
)
playlist
=
medialibrary
.
createPlaylist
(
name
)
if
(
playlist
==
null
)
return
@Runnable
playlistTracks
=
if
(
addTracks
)
{
newTrack
...
...
@@ -166,7 +167,7 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
override
fun
onClick
(
item
:
MediaLibraryItem
)
{
playlist
Id
=
item
.
id
playlist
=
item
as
AbstractPlaylist
editText
!!
.
setText
(
item
.
title
)
}
...
...
@@ -178,3 +179,5 @@ class SavePlaylistDialog : VLCBottomSheetDialogFragment(), View.OnClickListener,
const
val
KEY_NEW_TRACKS
=
"PLAYLIST_NEW_TRACKS"
}
}
fun
AbstractMedialibrary
.
getPlaylistByName
(
name
:
String
):
AbstractPlaylist
?
=
playlists
.
filter
{
it
.
title
==
name
}.
getOrNull
(
0
)
Shivansh Saini
@shivanshs9
mentioned in commit
03df0b7e
·
Aug 08, 2019
mentioned in commit
03df0b7e
mentioned in commit 03df0b7e71a914fe8dba1c15da4557bd60138d3b
Toggle commit list
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