From 31dc10cc08d894ec3e0ecfb77363a7d5e392e6f9 Mon Sep 17 00:00:00 2001 From: yashwanthgajji Date: Wed, 22 Jan 2025 21:36:29 -0600 Subject: [PATCH 1/3] checking filename change --- .../com/amaze/filemanager/utils/MainActivityHelper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java index 8eeaabe7ef..3b2545b1bb 100644 --- a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java +++ b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java @@ -339,9 +339,6 @@ public void rename( final boolean isDirectory, final Activity context, boolean rootmode) { - final Toast toast = - Toast.makeText(context, context.getString(R.string.renaming), Toast.LENGTH_SHORT); - toast.show(); HybridFile oldFile = new HybridFile(mode, oldPath); HybridFile newFile; if (Utils.isNullOrEmpty(newName)) { @@ -349,6 +346,12 @@ public void rename( } else { newFile = new HybridFile(mode, newPath, newName, isDirectory); } + if (oldFile.getSimpleName().equals(newFile.getSimpleName())) { + return; + } + final Toast toast = + Toast.makeText(context, context.getString(R.string.renaming), Toast.LENGTH_SHORT); + toast.show(); Operations.rename( oldFile, newFile, From afc982296a3f15485add4274cbd36780c307a8f1 Mon Sep 17 00:00:00 2001 From: yashwanthgajji Date: Wed, 22 Jan 2025 21:55:56 -0600 Subject: [PATCH 2/3] spotless changes --- .../java/com/amaze/filemanager/utils/MainActivityHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java index 3b2545b1bb..0d37b3d812 100644 --- a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java +++ b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java @@ -347,10 +347,10 @@ public void rename( newFile = new HybridFile(mode, newPath, newName, isDirectory); } if (oldFile.getSimpleName().equals(newFile.getSimpleName())) { - return; + return; } final Toast toast = - Toast.makeText(context, context.getString(R.string.renaming), Toast.LENGTH_SHORT); + Toast.makeText(context, context.getString(R.string.renaming), Toast.LENGTH_SHORT); toast.show(); Operations.rename( oldFile, From 7cdb429b840e204816bb3f0638f40887ce5ff078 Mon Sep 17 00:00:00 2001 From: yashwanthgajji Date: Sun, 26 Jan 2025 19:18:52 -0600 Subject: [PATCH 3/3] notifying user when no name change --- .../java/com/amaze/filemanager/utils/MainActivityHelper.java | 3 +++ app/src/main/res/values/strings.xml | 1 + 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java index 0d37b3d812..2cfdaf3dd5 100644 --- a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java +++ b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java @@ -347,6 +347,9 @@ public void rename( newFile = new HybridFile(mode, newPath, newName, isDirectory); } if (oldFile.getSimpleName().equals(newFile.getSimpleName())) { + Toast.makeText( + context, context.getString(R.string.no_changes_while_rename), Toast.LENGTH_SHORT) + .show(); return; } final Toast toast = diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7d3f97ae2a..f9355a3a22 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -284,6 +284,7 @@ Creating File Creating Folder Renaming + No changes were made as the new name matches the old name. %s cannot be empty Address Connection name