From 07d4b84e528976500f5eb8d62f887a3152228a28 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 13 Oct 2016 23:38:59 +0200 Subject: [PATCH] return the result of SelectFolderDialog as uri data --- .../filemanager/fragments/ItemsFragment.java | 3 +-- .../filepicker/dialogs/SelectFolderDialog.kt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) 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 538c7305..d03fbd51 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java @@ -60,7 +60,6 @@ public class ItemsFragment extends android.support.v4.app.Fragment @BindView(R.id.items_holder) CoordinatorLayout mCoordinatorLayout; public static final int SELECT_FOLDER_REQUEST = 1; - public static final String SELECT_FOLDER_PATH = "path"; private List mItems; private ItemInteractionListener mListener; @@ -562,7 +561,7 @@ public class ItemsFragment extends android.support.v4.app.Fragment @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == SELECT_FOLDER_REQUEST && resultCode == Activity.RESULT_OK && data != null) { - mCopyDestinationPath = data.getStringExtra(SELECT_FOLDER_PATH); + mCopyDestinationPath = data.getDataString(); mDestinationView.setText(mCopyDestinationPath); } super.onActivityResult(requestCode, resultCode, data); diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt index 152cfcdd..479248ba 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt @@ -3,6 +3,7 @@ package com.simplemobiletools.filepicker.dialogs import android.app.Activity import android.app.Dialog import android.content.Intent +import android.net.Uri import android.os.Bundle import android.support.v4.app.DialogFragment import android.support.v7.app.AlertDialog @@ -24,7 +25,6 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener { var mFirstUpdate: Boolean = true var mShowHidden: Boolean = false var mShowFullPath: Boolean = false - val SELECT_FOLDER_PATH = "path" fun newInstance(path: String, showHidden: Boolean, showFullPath: Boolean): SelectFolderDialog { mPath = path @@ -78,7 +78,7 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener { private fun sendResult() { val intent = Intent() - intent.putExtra(SELECT_FOLDER_PATH, mPath) + intent.data = Uri.parse(mPath) targetFragment.onActivityResult(requestCode, Activity.RESULT_OK, intent) dismiss() }