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
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
d0332249
Commit
d0332249
authored
7 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Check if quick access folders exist
(cherry picked from commit
b24fd8cd
)
parent
cb46813b
No related branches found
No related tags found
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/browser/FileBrowserFragment.java
+20
-12
20 additions, 12 deletions
...src/org/videolan/vlc/gui/browser/FileBrowserFragment.java
vlc-android/src/org/videolan/vlc/util/AndroidDevices.java
+12
-9
12 additions, 9 deletions
vlc-android/src/org/videolan/vlc/util/AndroidDevices.java
with
32 additions
and
21 deletions
vlc-android/src/org/videolan/vlc/gui/browser/FileBrowserFragment.java
+
20
−
12
View file @
d0332249
...
...
@@ -103,19 +103,27 @@ public class FileBrowserFragment extends BaseBrowserFragment {
}
// Set folders shortcuts
devices
.
add
(
new
DummyItem
(
getString
(
R
.
string
.
browser_quick_access
)));
final
MediaWrapper
movies
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_URI
);
movies
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
movies
);
if
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_FILE
.
exists
())
{
final
MediaWrapper
movies
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_URI
);
movies
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
movies
);
}
if
(!(
FileBrowserFragment
.
this
instanceof
FilePickerFragment
))
{
final
MediaWrapper
music
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_URI
);
music
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
music
);
final
MediaWrapper
podcasts
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_URI
);
podcasts
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
podcasts
);
final
MediaWrapper
downloads
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_URI
);
downloads
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
downloads
);
if
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_FILE
.
exists
())
{
final
MediaWrapper
music
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_URI
);
music
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
music
);
}
if
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_FILE
.
exists
())
{
final
MediaWrapper
podcasts
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_URI
);
podcasts
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
podcasts
);
}
if
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_FILE
.
exists
())
{
final
MediaWrapper
downloads
=
new
MediaWrapper
(
AndroidDevices
.
MediaFolders
.
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_URI
);
downloads
.
setType
(
MediaWrapper
.
TYPE_DIR
);
devices
.
add
(
downloads
);
}
}
VLCApplication
.
runOnMainThread
(
new
Runnable
()
{
@Override
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/util/AndroidDevices.java
+
12
−
9
View file @
d0332249
...
...
@@ -28,7 +28,6 @@ import android.net.Uri;
import
android.os.Build
;
import
android.os.Build.VERSION_CODES
;
import
android.os.Environment
;
import
android.support.annotation.NonNull
;
import
android.telephony.TelephonyManager
;
import
android.text.TextUtils
;
import
android.view.InputDevice
;
...
...
@@ -221,17 +220,21 @@ public class AndroidDevices {
}
public
static
class
MediaFolders
{
public
final
static
Uri
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_
URI
=
getFolderUri
(
Environment
.
DIRECTORY_MOVIES
);
public
final
static
Uri
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_
URI
=
getFolderUri
(
Environment
.
DIRECTORY_MUSIC
);
public
final
static
Uri
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_
URI
=
getFolderUri
(
Environment
.
DIRECTORY_PODCASTS
);
public
final
static
Uri
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_
URI
=
getFolderUri
(
Environment
.
DIRECTORY_DOWNLOADS
);
public
final
static
File
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_
FILE
=
Environment
.
getExternalStoragePublicDirectory
(
Environment
.
DIRECTORY_MOVIES
);
public
final
static
File
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_
FILE
=
Environment
.
getExternalStoragePublicDirectory
(
Environment
.
DIRECTORY_MUSIC
);
public
final
static
File
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_
FILE
=
Environment
.
getExternalStoragePublicDirectory
(
Environment
.
DIRECTORY_PODCASTS
);
public
final
static
File
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_
FILE
=
Environment
.
getExternalStoragePublicDirectory
(
Environment
.
DIRECTORY_DOWNLOADS
);
@NonNull
private
static
Uri
getFolderUri
(
String
type
)
{
public
final
static
Uri
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_URI
=
getFolderUri
(
EXTERNAL_PUBLIC_MOVIES_DIRECTORY_FILE
);
public
final
static
Uri
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_URI
=
getFolderUri
(
EXTERNAL_PUBLIC_MUSIC_DIRECTORY_FILE
);
public
final
static
Uri
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_URI
=
getFolderUri
(
EXTERNAL_PUBLIC_PODCAST_DIRECTORY_FILE
);
public
final
static
Uri
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_URI
=
getFolderUri
(
EXTERNAL_PUBLIC_DOWNLOAD_DIRECTORY_FILE
);
private
static
Uri
getFolderUri
(
File
file
)
{
try
{
return
Uri
.
parse
(
"file://"
+
Environment
.
getExternalStoragePublicDirectory
(
type
)
.
getCanonicalPath
());
return
Uri
.
parse
(
"file://"
+
file
.
getCanonicalPath
());
}
catch
(
IOException
ignored
)
{
return
Uri
.
parse
(
"file://"
+
Environment
.
getExternalStoragePublicDirectory
(
type
)
.
getPath
());
return
Uri
.
parse
(
"file://"
+
file
.
getPath
());
}
}
}
...
...
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