The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 15:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Fix a bug in FolderBrowser.java which was causing an incomplete directory structure to show.

Browse Source
This commit is contained in:
Lioncash 2013-08-22 02:52:05 -04:00
parent 85c78759c7
commit 988c168c2d
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
View File

@ -4,6 +4,7 @@ import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -28,8 +29,8 @@ public final class FolderBrowser extends Fragment
// Populates the FolderView with the given currDir's contents. // Populates the FolderView with the given currDir's contents.
private void Fill(File currDir) private void Fill(File currDir)
{ {
m_activity.setTitle(getString(R.string.current_dir) + currDir.getName()); m_activity.setTitle(getString(R.string.current_dir) + currDir.getName());
File[] dirs = currDir.listFiles(); File[] dirs = currDir.listFiles();
List<FolderBrowserItem>dir = new ArrayList<FolderBrowserItem>(); List<FolderBrowserItem>dir = new ArrayList<FolderBrowserItem>();
List<FolderBrowserItem>fls = new ArrayList<FolderBrowserItem>(); List<FolderBrowserItem>fls = new ArrayList<FolderBrowserItem>();
@ -38,20 +39,22 @@ public final class FolderBrowser extends Fragment
Set<String> validExts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff")); Set<String> validExts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff"));
Set<String> invalidExts = new HashSet<String>(Arrays.asList(".zip", ".rar", ".7z")); Set<String> invalidExts = new HashSet<String>(Arrays.asList(".zip", ".rar", ".7z"));
// Search for any directories or supported files within the current dir. // Search for any directories or files within the current dir.
try for(File entry : dirs)
{ {
for(File entry : dirs) try
{ {
String entryName = entry.getName(); String entryName = entry.getName();
boolean hasExtension = (entryName.lastIndexOf(".") != -1) ? true : false;
// Skip hidden folders/files.
if (entryName.charAt(0) != '.') if (entryName.charAt(0) != '.')
{ {
if(entry.isDirectory()) if(entry.isDirectory())
{ {
dir.add(new FolderBrowserItem(entryName, entry.getAbsolutePath(), true)); dir.add(new FolderBrowserItem(entryName, entry.getAbsolutePath(), true));
} }
else else if (entry.isFile() && hasExtension)
{ {
if (validExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.')))) if (validExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
{ {
@ -64,9 +67,10 @@ public final class FolderBrowser extends Fragment
} }
} }
} }
} catch (Exception ex)
catch(Exception ignored) {
{ Log.d("EXCEPTION", ex.toString());
}
} }
Collections.sort(dir); Collections.sort(dir);
@ -78,11 +82,11 @@ public final class FolderBrowser extends Fragment
dir.add(0, new FolderBrowserItem("..", getString(R.string.parent_directory), currDir.getParent(), true)); dir.add(0, new FolderBrowserItem("..", getString(R.string.parent_directory), currDir.getParent(), true));
adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, dir); adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, dir);
mDrawerList = (ListView) rootView.findViewById(R.id.gamelist); mDrawerList = (ListView) rootView.findViewById(R.id.gamelist);
mDrawerList.setAdapter(adapter); mDrawerList.setAdapter(adapter);
mDrawerList.setOnItemClickListener(mMenuItemClickListener); mDrawerList.setOnItemClickListener(mMenuItemClickListener);
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{ {