2 files changed, 14 insertions, 3 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
index 9b474e4..c61d136 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
@@ -61,13 +61,13 @@ public class PreferencesActivity extends CommonActivity {
         super.onActivityResult(requestCode, resultCode, data);
     }
 
-    public void startPicker() {
+    public void startPicker(String initialDir) {
         Intent intent = new Intent(PreferencesActivity.this, DirectoryChooserActivity.class);
 
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
 
-        String initialDir = prefs.getString("comics_directory",
+        if (initialDir == null) initialDir = prefs.getString("comics_directory",
                 Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
 
         intent.putExtra(DirectoryChooserActivity.EXTRA_CONFIG, DirectoryChooserConfig.builder()
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
index 457e503..e16871f 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
@@ -72,7 +72,18 @@ public class PreferencesFragment extends PreferenceFragment {
         findPreference("comics_directory").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                ((PreferencesActivity)getActivity()).startPicker();
+                ((PreferencesActivity)getActivity()).startPicker(null);
+                return true;
+            }
+        });
+
+        findPreference("comics_directory").setSummary(prefs.getString("comics_directory",
+                getString(R.string.prefs_comics_directory_summary)));
+
+        findPreference("open_storage_dir").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                ((PreferencesActivity)getActivity()).startPicker("/storage");
                 return true;
             }
         });