diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-12-17 09:50:54 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-12-18 20:30:35 +0000 |
| commit | bc570f7e6d8740d6c7cef91efc464c2bd36bacb8 (patch) | |
| tree | ca6a3db589b23407e0021a266703d95448b5dda3 | |
| parent | a09b90874d23cc781ae120590ac99ef0d61c8045 (diff) | |
| download | mupdf-bc570f7e6d8740d6c7cef91efc464c2bd36bacb8.tar.xz | |
Android: avoid null exceptions when visiting protected directories
| -rw-r--r-- | android/src/com/artifex/mupdf/ChoosePDFActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/android/src/com/artifex/mupdf/ChoosePDFActivity.java b/android/src/com/artifex/mupdf/ChoosePDFActivity.java index ae97dd87..af3e30fa 100644 --- a/android/src/com/artifex/mupdf/ChoosePDFActivity.java +++ b/android/src/com/artifex/mupdf/ChoosePDFActivity.java @@ -81,6 +81,8 @@ public class ChoosePDFActivity extends ListActivity { return file.isDirectory(); } }); + if (mDirs == null) + mDirs = new File[0]; mFiles = mDirectory.listFiles(new FileFilter() { @@ -97,6 +99,8 @@ public class ChoosePDFActivity extends ListActivity { return false; } }); + if (mFiles == null) + mFiles = new File[0]; Arrays.sort(mFiles, new Comparator<File>() { public int compare(File arg0, File arg1) { @@ -113,12 +117,10 @@ public class ChoosePDFActivity extends ListActivity { adapter.clear(); if (mParent != null) adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.PARENT, "..")); - if (mDirs != null) - for (File f : mDirs) - adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.DIR, f.getName())); - if (mFiles != null) - for (File f : mFiles) - adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.DOC, f.getName())); + for (File f : mDirs) + adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.DIR, f.getName())); + for (File f : mFiles) + adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.DOC, f.getName())); } }; |