piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3596 from Sonicadvance1/fix_android_crash

Browse Source 
[Android] Fix crash when we don't have access to a folder.
This commit is contained in:
Ryan Houdek 2016-02-22 16:15:54 -05:00
commit 6513062144
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
View File

@ -159,20 +159,25 @@ public final class FileAdapter extends RecyclerView.Adapter<FileViewHolder> impl
private ArrayList<FileListItem> generateFileList(File directory)
{
File[] children = directory.listFiles();
ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(children.length);
for (File child : children)
{
if (!child.isHidden())
{
FileListItem item = new FileListItem(child);
fileList.add(item);
}
}
mPath = directory.getAbsolutePath();
ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(0);
Collections.sort(fileList);
if (children != null)
{
fileList = new ArrayList<FileListItem>(children.length);
for (File child : children)
{
if (!child.isHidden())
{
FileListItem item = new FileListItem(child);
fileList.add(item);
}
}
Collections.sort(fileList);
}
return fileList;
}