From d3666b13e7567b8473af4a464a7e6bf0b174815c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 25 Oct 2016 20:12:09 +0200
Subject: [PATCH] use the new FilePicker for selecting the folder

---
 app/build.gradle                              |  2 +-
 .../filemanager/fragments/ItemsFragment.java  | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64da606b..dfe927a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     compile 'com.android.support:design:23.4.0'
     compile 'com.jakewharton:butterknife:8.0.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.simplemobiletools:filepicker:1.0.0'
+    compile 'com.simplemobiletools:filepicker:1.0.0@aar'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
diff --git a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java
index dc1dfa1e..1aa5561f 100644
--- a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java
+++ b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java
@@ -1,6 +1,5 @@
 package com.simplemobiletools.filemanager.fragments;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -39,6 +38,8 @@ import com.simplemobiletools.filemanager.Utils;
 import com.simplemobiletools.filemanager.adapters.ItemsAdapter;
 import com.simplemobiletools.filemanager.asynctasks.CopyTask;
 import com.simplemobiletools.filemanager.dialogs.PropertiesDialog;
+import com.simplemobiletools.filepicker.dialogs.PickFolderDialog;
+import com.simplemobiletools.filepicker.models.FileDirItem;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -60,7 +61,6 @@ public class ItemsFragment extends android.support.v4.app.Fragment
     @BindView(R.id.items_swipe_refresh) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.items_holder) CoordinatorLayout mCoordinatorLayout;
 
-    public static final int SELECT_FOLDER_REQUEST = 1;
     private static Map<String, Parcelable> mStates;
 
     private List<FileDirItem> mItems;
@@ -579,21 +579,21 @@ public class ItemsFragment extends android.support.v4.app.Fragment
         public void onClick(final View view) {
             final boolean showHiddenItems = mConfig.getShowHidden();
             final boolean showFullPath = mConfig.getShowFullPath();
-            /*PickFolderDialog dialog = PickFolderDialog.Companion.newInstance(mCopyDestinationPath, showHiddenItems, showFullPath);
-            dialog.setTargetFragment(ItemsFragment.this, SELECT_FOLDER_REQUEST);
-            dialog.show(getFragmentManager(), "selectFolder");*/
+            new PickFolderDialog(getContext(), mCopyDestinationPath, showHiddenItems, showFullPath, new PickFolderDialog.OnPickFolderListener() {
+                @Override
+                public void onFail(PickFolderDialog.PickFolderResult pickFolderResult) {
+
+                }
+
+                @Override
+                public void onSuccess(String path) {
+                    mCopyDestinationPath = path;
+                    mDestinationView.setText(path);
+                }
+            });
         }
     };
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == SELECT_FOLDER_REQUEST && resultCode == Activity.RESULT_OK && data != null) {
-            mCopyDestinationPath = data.getDataString();
-            mDestinationView.setText(mCopyDestinationPath);
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
     @Override
     public boolean onTouch(View v, MotionEvent event) {
         if (mSnackbar != null && mSnackbar.isShown()) {