norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Workaround for samsung devices.

Browse Source 
Looks like Samsunb broke getExternalMediaDirs() on 5.x as it tends to return a null File sometimes.

This code checks for it and falls back to the old case on total failure.
This commit is contained in:
Adrian Ulrich 2017-06-26 19:38:06 +02:00
parent f88f96d615
commit 023f0ef37f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ch/blinkenlights/android/medialibrary/MediaLibrary.java
View File

@ -154,14 +154,22 @@ public class MediaLibrary {
private static ArrayList<String> discoverDefaultMediaPaths(Context context) { private static ArrayList<String> discoverDefaultMediaPaths(Context context) {
ArrayList<String> defaultPaths = new ArrayList<>(); ArrayList<String> defaultPaths = new ArrayList<>();
// Try to discover media paths using getExternalMediaDirs() on 5.x and newer
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
for (File file : context.getExternalMediaDirs()) { for (File file : context.getExternalMediaDirs()) {
// Seems to happen on some Samsung 5.x devices. :-(
if (file == null)
continue;
String path = file.getAbsolutePath(); String path = file.getAbsolutePath();
int match = path.indexOf("/Android/media/"); // From Environment.DIR_ANDROID + Environment.DIR_MEDIA (both hidden) int match = path.indexOf("/Android/media/"); // From Environment.DIR_ANDROID + Environment.DIR_MEDIA (both hidden)
if (match >= 0) if (match >= 0)
defaultPaths.add(path.substring(0, match)); defaultPaths.add(path.substring(0, match));
} }
} else { }
// Fall back to old API and some guessing if nothing was found (yet).
if (defaultPaths.size() == 0) {
// this should always exist // this should always exist
defaultPaths.add(Environment.getExternalStorageDirectory().getAbsolutePath()); defaultPaths.add(Environment.getExternalStorageDirectory().getAbsolutePath());
// this *may* exist // this *may* exist