From 66d24112ff9a6146d8f64db77d2e3f565e2da00c Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 13 Jul 2014 19:29:10 +0400 Subject: [PATCH] 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 --- .../nononsenseapps/filepicker/FilePickerFragment.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java index edee91c..e5b94e0 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java @@ -141,10 +141,13 @@ public class FilePickerFragment extends AbstractFilePickerFragment { @Override public List loadInBackground() { ArrayList files = new ArrayList(); - 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;