diff --git a/app/src/main/java/com/simplemobiletools/filemanager/Utils.java b/app/src/main/java/com/simplemobiletools/filemanager/Utils.java index 2e1148fa..54466567 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/Utils.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/Utils.java @@ -23,7 +23,7 @@ public class Utils { } public static boolean hasStoragePermission(Context cxt) { - return ContextCompat.checkSelfPermission(cxt, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; + return ContextCompat.checkSelfPermission(cxt, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; } public static boolean isNameValid(String name) { 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 fa32780b..38cb5fc9 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java @@ -12,7 +12,6 @@ import android.support.annotation.Nullable; import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.Snackbar; import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.AlertDialog; import android.util.SparseBooleanArray; import android.view.ActionMode; import android.view.LayoutInflater; @@ -24,7 +23,6 @@ import android.view.ViewGroup; import android.webkit.MimeTypeMap; import android.widget.AdapterView; import android.widget.ListView; -import android.widget.TextView; import com.simplemobiletools.filemanager.Config; import com.simplemobiletools.filemanager.Constants; @@ -63,10 +61,7 @@ public class ItemsFragment extends android.support.v4.app.Fragment private ItemInteractionListener mListener; private List mToBeDeleted; private String mPath; - private String mCopyDestinationPath; private Snackbar mSnackbar; - private AlertDialog mCopyDialog; - private TextView mDestinationView; private Config mConfig; private boolean mShowHidden; @@ -112,7 +107,6 @@ public class ItemsFragment extends android.support.v4.app.Fragment private void fillItems() { mPath = getArguments().getString(Constants.PATH); - mCopyDestinationPath = mPath; final List newItems = getItems(mPath); Collections.sort(newItems); if (mItems != null && newItems.toString().equals(mItems.toString())) { @@ -378,11 +372,6 @@ public class ItemsFragment extends android.support.v4.app.Fragment public void onSuccess() { fillItems(); } - - @Override - public void onCancel() { - mCopyDestinationPath = mPath; - } }); } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt index d2dcac40..9cc693ed 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt @@ -51,7 +51,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br if (Utils.hasStoragePermission(applicationContext)) { initRootFileManager() } else { - ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), STORAGE_PERMISSION) + ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt index 20abcf3c..5b13629e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt @@ -38,8 +38,7 @@ class CopyDialog(val activity: Activity, val files: List, val path: String .setTitle(mContext.resources.getString(R.string.create_new)) .setView(view) .setPositiveButton(R.string.ok, null) - .setNegativeButton(R.string.cancel, { dialog, which -> dialogDismissed() }) - .setOnCancelListener { dialogDismissed() } + .setNegativeButton(R.string.cancel, null) .create().apply { window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) show() @@ -75,13 +74,7 @@ class CopyDialog(val activity: Activity, val files: List, val path: String } } - private fun dialogDismissed() { - listener.onCancel() - } - interface OnCopyListener { fun onSuccess() - - fun onCancel() } }