1 files changed, 19 insertions, 8 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 746c54b..9b474e4 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
@@ -8,8 +8,12 @@ import android.preference.PreferenceManager;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
+import net.rdrei.android.dirchooser.DirectoryChooserActivity;
+import net.rdrei.android.dirchooser.DirectoryChooserConfig;
+
 public class PreferencesActivity extends CommonActivity {
-	@Override
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         // we use that before parent onCreate so let's init locally
         m_prefs = PreferenceManager
@@ -42,9 +46,9 @@ public class PreferencesActivity extends CommonActivity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == DirectoryPicker.PICK_DIRECTORY && resultCode == RESULT_OK) {
-            Bundle extras = data.getExtras();
-            String path = (String) extras.get(DirectoryPicker.CHOSEN_DIRECTORY);
+        if (requestCode == REQUEST_PICK_DIRECTORY && resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+
+            String path = data.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR);
 
             SharedPreferences prefs = PreferenceManager
                     .getDefaultSharedPreferences(getApplicationContext());
@@ -58,14 +62,21 @@ public class PreferencesActivity extends CommonActivity {
     }
 
     public void startPicker() {
-        Intent intent = new Intent(PreferencesActivity.this, DirectoryPicker.class);
+        Intent intent = new Intent(PreferencesActivity.this, DirectoryChooserActivity.class);
 
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
 
-        intent.putExtra(DirectoryPicker.START_DIR, prefs.getString("comics_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()));
+        String initialDir = prefs.getString("comics_directory",
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+
+        intent.putExtra(DirectoryChooserActivity.EXTRA_CONFIG, DirectoryChooserConfig.builder()
+                .newDirectoryName("Comics")
+                .allowNewDirectoryNameModification(true)
+                .allowReadOnlyDirectory(true)
+                .initialDirectory(initialDir)
+                .build());
 
-        startActivityForResult(intent, DirectoryPicker.PICK_DIRECTORY);
+        startActivityForResult(intent, REQUEST_PICK_DIRECTORY);
     }
 }