TouchInstinct
/
NoNonsense-FilePicker
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NPE on empty directory 

Fixes NullPointerException when SD card is empty. 
File.listFiles() can return null.
http://developer.android.com/reference/java/io/File.html#listFiles%28%29
This commit is contained in:
Andrey 2014-07-13 19:29:10 +04:00
parent fb3ed0f924
commit 66d24112ff
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java
View File

@ -141,10 +141,13 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
@Override
public List<File> loadInBackground() {
ArrayList<File> files = new ArrayList<File>();
for (java.io.File f : currentPath.listFiles()) {
if ((mode == MODE_FILE || mode == MODE_FILE_AND_DIR)
|| f.isDirectory()) {
files.add(f);
File[] listFiles = currentPath.listFiles();
if(listFiles != null) {
for (java.io.File f : currentPath.listFiles()) {
if ((mode == MODE_FILE || mode == MODE_FILE_AND_DIR)
|| f.isDirectory()) {
files.add(f);
}
}
}
return files;