From bcb927febbee5bea992e859f989ebca7c9c55f64 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 14 Jun 2019 14:50:54 +0200 Subject: [PATCH] use the more advanced file renaming if only files are selected --- .../filemanager/pro/adapters/ItemsAdapter.kt | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt index 69c60c89..c6078893 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt @@ -178,18 +178,26 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList - if (paths.size == 1) { - val oldPath = paths.first() - RenameItemDialog(activity, oldPath) { - activity.config.moveFavorite(oldPath, it) + val fileDirItems = getSelectedFileDirItems() + val paths = fileDirItems.asSequence().map { it.path }.toMutableList() as ArrayList + when { + paths.size == 1 -> { + val oldPath = paths.first() + RenameItemDialog(activity, oldPath) { + activity.config.moveFavorite(oldPath, it) + activity.runOnUiThread { + listener?.refreshItems() + finishActMode() + } + } + } + fileDirItems.any { it.isDirectory } -> RenameItemsDialog(activity, paths) { activity.runOnUiThread { listener?.refreshItems() finishActMode() } } - } else { - RenameItemsDialog(activity, paths) { + else -> RenameItemsPatternDialog(activity, paths) { activity.runOnUiThread { listener?.refreshItems() finishActMode()