tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(files): files.listDir() return null

Browse Source
This commit is contained in:
hyb1996
2018-04-11 15:58:14 +08:00
parent 16692dadf3
commit dc790a297c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/com/stardust/pio/PFiles.java
View File

@@ -412,17 +412,23 @@ public class PFiles {
public static String[] listDir(String path) { public static String[] listDir(String path) {
File file = new File(path); File file = new File(path);
return file.list(); return wrapNonNull(file.list());
}
private static String[] wrapNonNull(String[] list) {
if (list == null)
return new String[0];
return list;
} }
public static String[] listDir(String path, final Func1<String, Boolean> filter) { public static String[] listDir(String path, final Func1<String, Boolean> filter) {
final File file = new File(path); final File file = new File(path);
return file.list(new FilenameFilter() { return wrapNonNull(file.list(new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
return filter.call(name); return filter.call(name);
} }
}); }));
} }
public static boolean isFile(String path) { public static boolean isFile(String path) {