[Android] Allow the user to select multiple browse paths.

2 files changed, 41 insertions, 39 deletions

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index db647723ad..060807d63c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.simonvt.menudrawer.MenuDrawer;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -25,7 +23,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 	
 	private float screenWidth;
 	private float screenHeight;
-	
+
 	public static native void onTouchEvent(int Action, float X, float Y);
 	
 	static
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index d585ead372..df7d29e91f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -28,7 +28,7 @@ import android.widget.Toast;
 
 public class GameListView extends ListActivity {
 	private GameListAdapter adapter;
-	private static File currentDir = null;
+	private static List<File> currentDir;
 	private MenuDrawer mDrawer;
 	
     private SideMenuAdapter mAdapter;
@@ -37,38 +37,42 @@ public class GameListView extends ListActivity {
     public static native String GetConfig(String Key, String Value, String Default);
     public static native void SetConfig(String Key, String Value, String Default);
 	
-	private void Fill(File f)
+	private void Fill()
     {
-		File[]dirs = f.listFiles();
+		
+		
 		this.setTitle("Game List");
-		List<GameListItem>dir = new ArrayList<GameListItem>();
 		List<GameListItem>fls = new ArrayList<GameListItem>();
-         
-		try
+		String Directories = GetConfig("General", "GCMPathes", "0");
+		int intDirectories = Integer.parseInt(Directories);
+		for (int a = 0; a < intDirectories; ++a)
 		{
-			for(File ff: dirs)
+			String BrowseDir = GetConfig("General", "GCMPaths" + Integer.toString(a), "");
+			File currentDir = new File(BrowseDir);
+			File[]dirs = currentDir.listFiles();
+			try
+			{
+				for(File ff: dirs)
+				{
+					if (ff.getName().charAt(0) != '.')
+						if(!ff.isDirectory())
+			            	if (ff.getName().toLowerCase().contains(".gcm") ||
+			            		ff.getName().toLowerCase().contains(".iso") ||
+			            		ff.getName().toLowerCase().contains(".wbfs") ||
+			            		ff.getName().toLowerCase().contains(".gcz") ||
+			            		ff.getName().toLowerCase().contains(".dol") ||
+			            		ff.getName().toLowerCase().contains(".elf"))
+			            			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+				}
+			}
+			catch(Exception e)
 			{
-				if (ff.getName().charAt(0) != '.')
-					if(!ff.isDirectory())
-	                	if (ff.getName().toLowerCase().contains(".gcm") ||
-	                		ff.getName().toLowerCase().contains(".iso") ||
-	                		ff.getName().toLowerCase().contains(".wbfs") ||
-	                		ff.getName().toLowerCase().contains(".gcz") ||
-	                		ff.getName().toLowerCase().contains(".dol") ||
-	                		ff.getName().toLowerCase().contains(".elf"))
-	                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-             }
-         }
-         catch(Exception e)
-         {
-         }
-         
-         Collections.sort(dir);
-         Collections.sort(fls);
-         dir.addAll(fls);
-         
-         adapter = new GameListAdapter(this,R.layout.main,dir);
-		 this.setListAdapter(adapter);
+			}
+		}
+		Collections.sort(fls);
+		 
+		adapter = new GameListAdapter(this,R.layout.main, fls);
+		this.setListAdapter(adapter);
     }
 	
 	@Override
@@ -103,11 +107,13 @@ public class GameListView extends ListActivity {
 		{
 			String FileName = data.getStringExtra("Select");
 			Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-			SetConfig("General", "GCMPathes", "1");
-			SetConfig("General", "GCMPaths0", FileName);
+			String Directories = GetConfig("General", "GCMPathes", "0");
+			int intDirectories = Integer.parseInt(Directories);
+			Directories = Integer.toString(intDirectories + 1);
+			SetConfig("General", "GCMPathes", Directories);
+			SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
 			
-			currentDir = new File(FileName);
-			Fill(currentDir);
+			Fill();
 		}
 	}
 	
@@ -119,10 +125,8 @@ public class GameListView extends ListActivity {
 		 
 		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
 		 
-		String BrowseDir = GetConfig("General", "GCMPaths0", "");
-		if(currentDir == null)
-			currentDir = new File(BrowseDir);
-		Fill(currentDir);
+		
+		Fill();
 		 
 		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
 		dir.add(new SideMenuItem("Browse Folder", 0));