Skip to content

Commit b1c9822

Browse files
committed
request WRITE_EXTERNAL_STORAGE + cleanup
1 parent 22b3c3f commit b1c9822

File tree

4 files changed

+3
-21
lines changed

4 files changed

+3
-21
lines changed

app/src/main/java/com/simplemobiletools/filemanager/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void showToast(Context context, int resId) {
2323
}
2424

2525
public static boolean hasStoragePermission(Context cxt) {
26-
return ContextCompat.checkSelfPermission(cxt, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
26+
return ContextCompat.checkSelfPermission(cxt, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
2727
}
2828

2929
public static boolean isNameValid(String name) {

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.support.design.widget.CoordinatorLayout;
1313
import android.support.design.widget.Snackbar;
1414
import android.support.v4.widget.SwipeRefreshLayout;
15-
import android.support.v7.app.AlertDialog;
1615
import android.util.SparseBooleanArray;
1716
import android.view.ActionMode;
1817
import android.view.LayoutInflater;
@@ -24,7 +23,6 @@
2423
import android.webkit.MimeTypeMap;
2524
import android.widget.AdapterView;
2625
import android.widget.ListView;
27-
import android.widget.TextView;
2826

2927
import com.simplemobiletools.filemanager.Config;
3028
import com.simplemobiletools.filemanager.Constants;
@@ -63,10 +61,7 @@ public class ItemsFragment extends android.support.v4.app.Fragment
6361
private ItemInteractionListener mListener;
6462
private List<String> mToBeDeleted;
6563
private String mPath;
66-
private String mCopyDestinationPath;
6764
private Snackbar mSnackbar;
68-
private AlertDialog mCopyDialog;
69-
private TextView mDestinationView;
7065
private Config mConfig;
7166

7267
private boolean mShowHidden;
@@ -112,7 +107,6 @@ public void onPause() {
112107

113108
private void fillItems() {
114109
mPath = getArguments().getString(Constants.PATH);
115-
mCopyDestinationPath = mPath;
116110
final List<FileDirItem> newItems = getItems(mPath);
117111
Collections.sort(newItems);
118112
if (mItems != null && newItems.toString().equals(mItems.toString())) {
@@ -378,11 +372,6 @@ private void displayCopyDialog() {
378372
public void onSuccess() {
379373
fillItems();
380374
}
381-
382-
@Override
383-
public void onCancel() {
384-
mCopyDestinationPath = mPath;
385-
}
386375
});
387376
}
388377

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
5151
if (Utils.hasStoragePermission(applicationContext)) {
5252
initRootFileManager()
5353
} else {
54-
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), STORAGE_PERMISSION)
54+
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION)
5555
}
5656
}
5757

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
3838
.setTitle(mContext.resources.getString(R.string.create_new))
3939
.setView(view)
4040
.setPositiveButton(R.string.ok, null)
41-
.setNegativeButton(R.string.cancel, { dialog, which -> dialogDismissed() })
42-
.setOnCancelListener { dialogDismissed() }
41+
.setNegativeButton(R.string.cancel, null)
4342
.create().apply {
4443
window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
4544
show()
@@ -75,13 +74,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
7574
}
7675
}
7776

78-
private fun dialogDismissed() {
79-
listener.onCancel()
80-
}
81-
8277
interface OnCopyListener {
8378
fun onSuccess()
84-
85-
fun onCancel()
8679
}
8780
}

0 commit comments

Comments
 (0)