Skip to content

Commit 485c5ba

Browse files
committed
allow brackets at filenames
1 parent b7cbb83 commit 485c5ba

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Utils {
3030
}
3131

3232
fun isNameValid(name: String): Boolean {
33-
val pattern = Pattern.compile("^[-_.A-Za-z0-9 ]+$")
33+
val pattern = Pattern.compile("^[-_.A-Za-z0-9() ]+$")
3434
val matcher = pattern.matcher(name)
3535
return matcher.matches()
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
165165
@TargetApi(Build.VERSION_CODES.KITKAT)
166166
private fun saveTreeUri(resultData: Intent) {
167167
val treeUri = resultData.data
168-
mConfig.treeUri = resultData.data.toString()
168+
mConfig.treeUri = treeUri.toString()
169169

170170
val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
171171
contentResolver.takePersistableUriPermission(treeUri, takeFlags)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import kotlinx.android.synthetic.main.copy_item.view.*
2020
import java.io.File
2121

2222
class CopyDialog(val activity: Activity, val files: List<File>, val path: String, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
23-
val mContext = activity
2423

2524
init {
26-
val view = LayoutInflater.from(mContext).inflate(R.layout.copy_item, null)
25+
val context = activity
26+
val view = LayoutInflater.from(context).inflate(R.layout.copy_item, null)
2727
view.source.text = "${path.trimEnd('/')}/"
2828

2929
view.destination.setOnClickListener {
30-
val config = Config.newInstance(mContext)
30+
val config = Config.newInstance(context)
3131
FilePickerDialog(activity, path, false, config.showHidden, object : FilePickerDialog.OnFilePickerListener {
3232
override fun onFail(error: FilePickerDialog.FilePickerResult) {
3333
}
@@ -38,8 +38,8 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
3838
})
3939
}
4040

41-
AlertDialog.Builder(mContext)
42-
.setTitle(mContext.resources.getString(if (files.size == 1) R.string.copy_item else R.string.copy_items))
41+
AlertDialog.Builder(context)
42+
.setTitle(context.resources.getString(if (files.size == 1) R.string.copy_item else R.string.copy_items))
4343
.setView(view)
4444
.setPositiveButton(R.string.ok, null)
4545
.setNegativeButton(R.string.cancel, null)
@@ -73,7 +73,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
7373
}
7474

7575
if (Utils.needsStupidWritePermissions(context, destinationPath) && Config.newInstance(context).treeUri.isEmpty()) {
76-
WritePermissionDialog(activity, object: WritePermissionDialog.OnWritePermissionListener {
76+
WritePermissionDialog(activity, object : WritePermissionDialog.OnWritePermissionListener {
7777
override fun onConfirmed() {
7878
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
7979
activity.startActivityForResult(intent, MainActivity.OPEN_DOCUMENT_TREE)
@@ -85,7 +85,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
8585
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) {
8686
context.toast(R.string.copying)
8787
val pair = Pair<List<File>, File>(files, destinationDir)
88-
CopyTask(copyListener, mContext).execute(pair)
88+
CopyTask(copyListener, context).execute(pair)
8989
dismiss()
9090
} else {
9191
if (Utils.isPathOnSD(context, view.source.value) && Utils.isPathOnSD(context, destinationPath)) {
@@ -100,7 +100,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
100100
} else {
101101
context.toast(R.string.copying_no_delete, Toast.LENGTH_LONG)
102102
val pair = Pair<List<File>, File>(files, destinationDir)
103-
CopyTask(copyListener, mContext).execute(pair)
103+
CopyTask(copyListener, context).execute(pair)
104104
dismiss()
105105
}
106106
}

0 commit comments

Comments
 (0)