From f4f2adde24d5b255348d694dd159b810c25420c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 17 Nov 2016 17:06:19 +0100 Subject: [PATCH] editing renameItemDialog style so its not that indented --- .../filemanager/dialogs/RenameItemDialog.kt | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt index 28391dce..9d6be9e1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt @@ -27,31 +27,32 @@ class RenameItemDialog(val context: Context, val path: String, val item: FileDir show() getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({ val newName = view.item_name.value - if (newName.isAValidFilename()) { - val currFile = File(path, item.name) - val newFile = File(path, newName) + if (!newName.isAValidFilename()) { + context.toast(R.string.invalid_name) + return@setOnClickListener + } - if (newFile.exists()) { - context.toast(R.string.name_taken) - return@setOnClickListener - } + val currFile = File(path, item.name) + val newFile = File(path, newName) - if (context.needsStupidWritePermissions(path)) { - val document = context.getFileDocument(currFile.absolutePath, Config.newInstance(context).treeUri) - if (document.canWrite()) - document.renameTo(newName) + if (newFile.exists()) { + context.toast(R.string.name_taken) + return@setOnClickListener + } + + if (context.needsStupidWritePermissions(path)) { + val document = context.getFileDocument(currFile.absolutePath, Config.newInstance(context).treeUri) + if (document.canWrite()) + document.renameTo(newName) + sendSuccess(newFile) + dismiss() + } else { + if (currFile.renameTo(newFile)) { sendSuccess(newFile) dismiss() } else { - if (currFile.renameTo(newFile)) { - sendSuccess(newFile) - dismiss() - } else { - context.toast(R.string.error_occurred) - } + context.toast(R.string.error_occurred) } - } else { - context.toast(R.string.invalid_name) } }) }