From 85efbd7573662a043b0ecab8babf428cde94e016 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Wed, 2 Jan 2013 19:10:09 +0100
Subject: [PATCH] Config option to set filebrowser start

---
 AndroidManifest.xml                               |  1 +
 res/xml/preference_library.xml                    |  7 +++++++
 .../android/vanilla/FileSystemAdapter.java        |  2 +-
 .../android/vanilla/PlaybackActivity.java         | 15 ++++++++++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 006213e3..c6dbe657 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,5 +150,6 @@ THE SOFTWARE.
 		<activity
 			android:name="TabOrderActivity"
 			android:theme="@style/BackActionBar" />
+		<activity android:name="FilebrowserStartActivity" />
 	</application>
 </manifest>
diff --git a/res/xml/preference_library.xml b/res/xml/preference_library.xml
index 7cf670c7..33de2a3a 100644
--- a/res/xml/preference_library.xml
+++ b/res/xml/preference_library.xml
@@ -47,5 +47,12 @@ THE SOFTWARE.
 		android:entries="@array/default_playlist_action_entries"
 		android:entryValues="@array/entry_values"
 		android:defaultValue="3" />
+	<PreferenceScreen
+		android:title="@string/filebrowser_start"
+		android:summary="@string/customize_filebrowser_start">
+		<intent
+			android:targetPackage="ch.blinkenlights.android.vanilla"
+			android:targetClass="ch.blinkenlights.android.vanilla.FilebrowserStartActivity" />
+	</PreferenceScreen>
 	<ch.blinkenlights.android.vanilla.ScanPreference />
 </PreferenceScreen>
diff --git a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
index 46c126df..aaf3cdcc 100644
--- a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
@@ -134,7 +134,7 @@ public class FileSystemAdapter
 		mFolderIcon = activity.getResources().getDrawable(R.drawable.folder);
 		mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		if (limiter == null) {
-			limiter = buildLimiter(Environment.getExternalStorageDirectory());
+			limiter = buildLimiter( activity.getFilesystemBrowseStart() );
 		}
 		setLimiter(limiter);
 	}
diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
index cbd0ef5c..adbdb3df 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java
@@ -22,6 +22,7 @@
 
 package ch.blinkenlights.android.vanilla;
 
+import java.io.File;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,6 +34,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
+import android.os.Environment;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -279,7 +281,18 @@ public abstract class PlaybackActivity extends Activity
 			}
 		});
 	}
-
+	
+	/**
+	 * Called by FileSystem adapter to get the start folder
+	 * for browsing directories
+	 */
+	protected File getFilesystemBrowseStart() {
+		SharedPreferences prefs = PlaybackService.getSettings(this);
+		String folder = prefs.getString("filesystem_browse_start", "");
+		File fs_start = new File( folder.equals("") ? Environment.getExternalStorageDirectory().getAbsolutePath() : folder );
+		return fs_start;
+	}
+	
 	/**
 	 * Called by PlaybackService to update the current song.
 	 */