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

discover storage paths automatically

Browse Source
This commit is contained in:
Adrian Ulrich 2016-11-27 18:46:48 +01:00
parent b288425994
commit fd7d3cb31b
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import android.content.ContentValues;
import android.database.Cursor;
import android.database.ContentObserver;
import android.provider.MediaStore;
import android.os.Environment;
import java.util.ArrayList;
import java.io.File;
@ -56,8 +57,9 @@ public class MediaLibrary {
sBackend = new MediaLibraryBackend(context);
sScanner = new MediaScanner(sBackend);
File dir = new File("/storage/emulated/0");
sScanner.startScan(dir);
for (File dir : discoverMediaPaths()) {
sScanner.startScan(dir);
}
}
// }
}
@ -284,6 +286,25 @@ public class MediaLibrary {
return (hash < 0 ? hash*-1 : hash);
}
/**
* Returns the guessed media paths for this device
*
* @return array with guessed directories
*/
public static File[] discoverMediaPaths() {
ArrayList<File> scanTargets = new ArrayList<File>();
// this should always exist
scanTargets.add(Environment.getExternalStorageDirectory());
// this *may* exist
File sdCard = new File("/storage/sdcard1");
if (sdCard.isDirectory())
scanTargets.add(sdCard);
return scanTargets.toArray(new File[scanTargets.size()]);
}
// Columns of Song entries
public interface SongColumns {
/**