fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

return the result of SelectFolderDialog as uri data

Browse Source
This commit is contained in:
tibbi
2016-10-13 23:38:59 +02:00
parent 2cdc142ee9
commit 07d4b84e52
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java
View File

@ -60,7 +60,6 @@ public class ItemsFragment extends android.support.v4.app.Fragment
@BindView(R.id.items_holder) CoordinatorLayout mCoordinatorLayout; @BindView(R.id.items_holder) CoordinatorLayout mCoordinatorLayout;
public static final int SELECT_FOLDER_REQUEST = 1; public static final int SELECT_FOLDER_REQUEST = 1;
public static final String SELECT_FOLDER_PATH = "path";
private List<FileDirItem> mItems; private List<FileDirItem> mItems;
private ItemInteractionListener mListener; private ItemInteractionListener mListener;
@ -562,7 +561,7 @@ public class ItemsFragment extends android.support.v4.app.Fragment
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == SELECT_FOLDER_REQUEST && resultCode == Activity.RESULT_OK && data != null) { if (requestCode == SELECT_FOLDER_REQUEST && resultCode == Activity.RESULT_OK && data != null) {
mCopyDestinationPath = data.getStringExtra(SELECT_FOLDER_PATH); mCopyDestinationPath = data.getDataString();
mDestinationView.setText(mCopyDestinationPath); mDestinationView.setText(mCopyDestinationPath);
} }
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);

4
library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt
View File

@ -3,6 +3,7 @@ package com.simplemobiletools.filepicker.dialogs
import android.app.Activity import android.app.Activity
import android.app.Dialog import android.app.Dialog
import android.content.Intent import android.content.Intent
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.DialogFragment import android.support.v4.app.DialogFragment
import android.support.v7.app.AlertDialog import android.support.v7.app.AlertDialog
@ -24,7 +25,6 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener {
var mFirstUpdate: Boolean = true var mFirstUpdate: Boolean = true
var mShowHidden: Boolean = false var mShowHidden: Boolean = false
var mShowFullPath: Boolean = false var mShowFullPath: Boolean = false
val SELECT_FOLDER_PATH = "path"
fun newInstance(path: String, showHidden: Boolean, showFullPath: Boolean): SelectFolderDialog { fun newInstance(path: String, showHidden: Boolean, showFullPath: Boolean): SelectFolderDialog {
mPath = path mPath = path
@ -78,7 +78,7 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener {
private fun sendResult() { private fun sendResult() {
val intent = Intent() val intent = Intent()
intent.putExtra(SELECT_FOLDER_PATH, mPath) intent.data = Uri.parse(mPath)
targetFragment.onActivityResult(requestCode, Activity.RESULT_OK, intent) targetFragment.onActivityResult(requestCode, Activity.RESULT_OK, intent)
dismiss() dismiss()
} }