File/folder chooser dialog fixes

2 files changed, 8 insertions, 0 deletions

diff --git a/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java b/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java
index d88a086..18d0ceb 100644
--- a/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java
+++ b/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FileChooserDialog.java
@@ -153,10 +153,14 @@ public class FileChooserDialog extends DialogFragment implements MaterialDialog.
     public void onSelection(MaterialDialog materialDialog, View view, int i, CharSequence s) {
         if (canGoUp && i == 0) {
             parentFolder = parentFolder.getParentFile();
+            if (parentFolder.getAbsolutePath().equals("/storage/emulated"))
+                parentFolder = parentFolder.getParentFile();
             canGoUp = parentFolder.getParent() != null;
         } else {
             parentFolder = parentContents[canGoUp ? i - 1 : i];
             canGoUp = true;
+            if (parentFolder.getAbsolutePath().equals("/storage/emulated"))
+                parentFolder = Environment.getExternalStorageDirectory();
         }
         if (parentFolder.isFile()) {
             mCallback.onFileSelection(parentFolder);
diff --git a/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java b/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java
index 2fcd3e9..71a2871 100644
--- a/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java
+++ b/commons/src/main/java/com/afollestad/materialdialogs/folderselector/FolderChooserDialog.java
@@ -115,10 +115,14 @@ public class FolderChooserDialog extends DialogFragment implements MaterialDialo
     public void onSelection(MaterialDialog materialDialog, View view, int i, CharSequence s) {
         if (canGoUp && i == 0) {
             parentFolder = parentFolder.getParentFile();
+            if (parentFolder.getAbsolutePath().equals("/storage/emulated"))
+                parentFolder = parentFolder.getParentFile();
             canGoUp = parentFolder.getParent() != null;
         } else {
             parentFolder = parentContents[canGoUp ? i - 1 : i];
             canGoUp = true;
+            if (parentFolder.getAbsolutePath().equals("/storage/emulated"))
+                parentFolder = Environment.getExternalStorageDirectory();
         }
         parentContents = listFiles();
         MaterialDialog dialog = (MaterialDialog) getDialog();