Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
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
08a95c69
Commit
08a95c69
authored
7 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Fill browsers with Medialibrary items if available
Close
#234
#235
parent
2c9289c0
No related branches found
No related tags found
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/BaseBrowserFragment.java
+14
-2
14 additions, 2 deletions
...src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java
with
14 additions
and
2 deletions
vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java
+
14
−
2
View file @
08a95c69
...
...
@@ -28,6 +28,7 @@ import android.net.Uri;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Message
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
...
...
@@ -252,7 +253,7 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
@Override
public
void
onMediaAdded
(
int
index
,
Media
media
)
{
boolean
wasEmtpy
=
mAdapter
.
isEmpty
();
mAdapter
.
addItem
(
new
MediaWrapper
(
media
),
false
);
mAdapter
.
addItem
(
get
MediaWrapper
(
media
),
false
);
if
(!
wasEmtpy
)
return
;
updateEmptyView
();
...
...
@@ -552,7 +553,7 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
if
(
type
==
Media
.
Type
.
Directory
)
directories
.
add
(
new
MediaWrapper
(
media
));
else
if
(
type
==
Media
.
Type
.
File
)
files
.
add
(
new
MediaWrapper
(
media
));
files
.
add
(
get
MediaWrapper
(
media
));
}
@Override
...
...
@@ -619,6 +620,17 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
}
};
@NonNull
private
MediaWrapper
getMediaWrapper
(
Media
media
)
{
MediaWrapper
mw
=
null
;
Uri
uri
=
media
.
getUri
();
if
(
media
.
getType
()
==
Media
.
Type
.
File
&&
"file"
.
equals
(
uri
.
getScheme
()))
mw
=
mMediaLibrary
.
getMedia
(
uri
);
if
(
mw
==
null
)
mw
=
new
MediaWrapper
(
media
);
return
mw
;
}
@Override
public
boolean
enableSearchOption
()
{
return
!
isRootDirectory
();
...
...
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