Skip to content

Commit 4446539

Browse files
committed
update a write permissions check
1 parent 4f582b1 commit 4446539

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.simplemobiletools.filemanager.Constants;
2929
import com.simplemobiletools.filemanager.R;
3030
import com.simplemobiletools.filemanager.Utils;
31+
import com.simplemobiletools.filemanager.activities.SimpleActivity;
3132
import com.simplemobiletools.filemanager.adapters.ItemsAdapter;
3233
import com.simplemobiletools.filemanager.asynctasks.CopyTask;
3334
import com.simplemobiletools.filemanager.dialogs.CopyDialog;
@@ -370,7 +371,7 @@ private void displayCopyDialog() {
370371
itemsToCopy.add(new File(item.getPath()));
371372
}
372373

373-
new CopyDialog(getActivity(), itemsToCopy, this, new CopyDialog.OnCopyListener() {
374+
new CopyDialog((SimpleActivity) getActivity(), itemsToCopy, this, new CopyDialog.OnCopyListener() {
374375
@Override
375376
public void onSuccess() {
376377
fillItems();

app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package com.simplemobiletools.filemanager.dialogs
22

3-
import android.app.Activity
4-
import android.content.Intent
53
import android.support.v4.util.Pair
64
import android.support.v7.app.AlertDialog
75
import android.view.LayoutInflater
86
import android.view.WindowManager
97
import com.simplemobiletools.filemanager.Config
10-
import com.simplemobiletools.filemanager.Constants
118
import com.simplemobiletools.filemanager.R
9+
import com.simplemobiletools.filemanager.activities.SimpleActivity
1210
import com.simplemobiletools.filemanager.asynctasks.CopyTask
1311
import com.simplemobiletools.filepicker.dialogs.FilePickerDialog
14-
import com.simplemobiletools.filepicker.dialogs.WritePermissionDialog
15-
import com.simplemobiletools.filepicker.extensions.*
12+
import com.simplemobiletools.filepicker.extensions.humanizePath
13+
import com.simplemobiletools.filepicker.extensions.isPathOnSD
14+
import com.simplemobiletools.filepicker.extensions.scanFiles
15+
import com.simplemobiletools.filepicker.extensions.toast
1616
import kotlinx.android.synthetic.main.copy_item.view.*
1717
import java.io.File
1818
import java.util.*
1919

20-
class CopyDialog(val activity: Activity, val files: ArrayList<File>, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
20+
class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
2121

2222
init {
2323
val context = activity
@@ -72,13 +72,7 @@ class CopyDialog(val activity: Activity, val files: ArrayList<File>, val copyLis
7272
}
7373
}
7474

75-
if (context.needsStupidWritePermissions(destinationPath) && config.treeUri.isEmpty()) {
76-
WritePermissionDialog(activity, object : WritePermissionDialog.OnConfirmedListener {
77-
override fun onConfirmed() {
78-
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
79-
activity.startActivityForResult(intent, Constants.OPEN_DOCUMENT_TREE)
80-
}
81-
})
75+
if (activity.isShowingPermDialog(destinationDir)) {
8276
return@setOnClickListener
8377
}
8478

0 commit comments

Comments
 (0)