Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
4d922846
Commit
4d922846
authored
Jan 26, 2015
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AudioBrowserListAdapter: merge items with different case
parent
8c5578ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
...c/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
+8
-6
No files found.
vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
View file @
4d922846
...
...
@@ -113,12 +113,13 @@ public class AudioBrowserListAdapter extends BaseAdapter implements SectionIndex
public
void
add
(
String
title
,
String
subTitle
,
MediaWrapper
media
)
{
if
(
title
==
null
)
return
;
title
=
title
.
trim
();
final
String
titleKey
=
title
.
toLowerCase
();
if
(
subTitle
!=
null
)
subTitle
=
subTitle
.
trim
();
if
(
mMediaItemMap
.
containsKey
(
title
))
mMediaItemMap
.
get
(
title
).
mMediaList
.
add
(
media
);
if
(
mMediaItemMap
.
containsKey
(
title
Key
))
mMediaItemMap
.
get
(
title
Key
).
mMediaList
.
add
(
media
);
else
{
ListItem
item
=
new
ListItem
(
title
,
subTitle
,
media
,
false
);
mMediaItemMap
.
put
(
title
,
item
);
mMediaItemMap
.
put
(
title
Key
,
item
);
mItems
.
add
(
item
);
}
}
...
...
@@ -210,11 +211,12 @@ public class AudioBrowserListAdapter extends BaseAdapter implements SectionIndex
public
void
addSeparator
(
String
title
,
MediaWrapper
media
)
{
if
(
title
==
null
)
return
;
title
=
title
.
trim
();
if
(
mSeparatorItemMap
.
containsKey
(
title
))
mSeparatorItemMap
.
get
(
title
).
mMediaList
.
add
(
media
);
final
String
titleKey
=
title
.
toLowerCase
();
if
(
mSeparatorItemMap
.
containsKey
(
titleKey
))
mSeparatorItemMap
.
get
(
titleKey
).
mMediaList
.
add
(
media
);
else
{
ListItem
item
=
new
ListItem
(
title
,
null
,
media
,
true
);
mSeparatorItemMap
.
put
(
title
,
item
);
mSeparatorItemMap
.
put
(
title
Key
,
item
);
mItems
.
add
(
item
);
}
}
...
...
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