Fixes #3886 #3898

yatiksihag01 · 2023-08-04T10:44:08Z

Description

Disabled file modification while the copy/paste snackbar is visible. This behavior is expected, and it is implemented in almost all popular file manager apps. When users choose to paste a file into the same folder from which they copied it, they will be presented with the option to Rename & Save. This option will automatically append (1), (2), etc., at the end of the file name and save it.

Issue tracker

Fixes #3886

Automatic tests

Added test cases

Manual tests

Done

Device: Samsung Galaxy A13
OS: Android 13

Build tasks success

Successfully running following tasks on local:

./gradlew assembledebug
./gradlew spotlessCheck

…es in the same folder.

app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java

VishalNehra · 2023-08-06T20:12:53Z

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PrepareCopyTask.java

+    do {
+      newName =
+          oldName.substring(0, oldName.lastIndexOf("."))
+              + "("


@TranceLove @VishnuSanal your inputs here. Do we have a library or a utility class that we can utilise for this?

Related #2078 sorry but still need some time to work on it.

You may want to see if #3913 can help.

VishnuSanal

@yatiksihag01 hi, great work! here are some things I noticed:

currently, the renaming works only for files. if I try to copy a directory & paste it, it renames every file inside of that folder - which is not the expected behavior; the directory simply should be renamed instead.

yatiksihag01 · 2023-08-09T16:25:57Z

@VishnuSanal thanks for your feedback and for pointing out the issue. Sorry for the oversight, I'll try to make the necessary changes asap.

…e directory.

yatiksihag01 · 2023-08-13T17:59:14Z

Hi @VishnuSanal in this commit I've made following changes:

Pasting in the same directory with a conflicting non-directory file (e.g. images, videos etc.) will prompt a rename or skip choice.
Move operation in same directory is restricted.
If the conflicting file is a directory, it's automatically renamed and saved without showing any dialog. This workaround avoids the complexity of showing a dialog in this scenario, as it would require significant changes. Because during tree creation, the original conflicting directory is already removed and a new node is created. And now all the files and subdirectories under this new node behave as conflicting entities. Ig this approach offers the best solution. I'm open to any suggestions or feedback you might have.

Note: When I use MakeDirectoryOperation.mkdirs() method to create new directory in my Android 13 device, it creates two directories, one at the specified path and another one inside this new directory but with same name.

VishnuSanal · 2023-08-13T18:03:39Z

@yatiksihag01 awesome! i will review the PR in a while.

VishnuSanal

@yatiksihag01 awesome work! operation with files works great as expected! I noticed some glitches on working with directories:

moving/copying a file from a path to another path simply falls back to the previous implementation (i.e, skip, overwrite, cancel). the dialog appears for every file within, if a directory is moved/copied.
can you think of a solution to fix the creation of empty directories within?

yatiksihag01 · 2023-08-16T18:19:29Z

Hi @VishnuSanal,

As I explained in my previous comment, when conflicting file is a directory, the original conflicting directory gets removed and a new node is created. And now all the files and subdirectories under this new node behave as conflicting files. This problem is even with stable version of app. So we've two choices, either we simply rename and save conflicting directories without showing any dialog or explore an entirely new implementation using Kotlin, maybe using suspendCancellableCoroutine or something else I'm not sure.
I haven't fully investigated the mkdirs() bug yet, as I wasn't sure whether there's an existing open issue and if someone is fixing it. I'll try to fix it.

yatiksihag01 · 2023-08-17T18:59:54Z

Actually the duplicate subdirectory issue was caused by the wrong HybridFile constructor I used. I resolved this issue and also documented the MakeDirectoryOperation.mkdirs() method to provide guidance for future developers.

VishnuSanal · 2023-09-03T18:12:01Z

I tested here & there were some unexpected behaviors; I'll post a detailed review comment in a while. (edit: or should I? since this is still in WIP? 🤔)

yatiksihag01 · 2023-09-05T03:02:36Z

@VishnuSanal, I still have some work to do, but please tell about the unexpected behavior you encountered.

VishnuSanal · 2023-09-07T11:09:17Z

@VishnuSanal, I still have some work to do, but please tell about the unexpected behavior you encountered.

i see. I basically wasn't able to rename. copying & moving from a different directory prompted me a dialog, clicking on 'rename' resulted in a Toast message saying 'no file overwritten' (both files & directories). copying from the same directory resulted in the same too. moving to the same directory resulted in the new operation not permitted Toast message.

…ava, renaming will be done using FilenameHelper

yatiksihag01 · 2023-09-07T13:23:48Z

@VishnuSanal I fixed the issues you mentioned. There are still these bugs to be resolved by @TranceLove. And when user try to move the files in same directory they should see this toast message as it doesn't makes any sense to move file in same directory.

VishalNehra · 2023-09-18T13:47:57Z

@VishnuSanal please review here as you get time

VishalNehra · 2023-09-18T13:48:35Z

@yatiksihag01 please see and resolve the static code analysis errors in the build
https://github.com/TeamAmaze/AmazeFileManager/pull/3898/checks?check_run_id=16643918735

yatiksihag01 · 2023-09-18T18:08:25Z

@VishalNehra One error in static code analysis is about showDialog() function length. I can reduce the length but it'll add unnecessary complication. So should I do that?

VishalNehra · 2023-09-18T20:23:50Z

Yes please

VishalNehra · 2023-09-20T07:21:28Z

@VishnuSanal please review here

VishalNehra · 2023-09-20T07:23:25Z

You're not using filenamehelper from #3913 ?

yatiksihag01 · 2023-09-20T07:56:25Z

@VishalNehra Yes, I'm using #3913 for renaming.

VishnuSanal

great job! works as expected. operations I tested:

moving to the same directory
- "same destination & source Toast" (both for directories & files)
copying to the same directory
- works as expected (both for directories & files)
copying/moving from another directory
- directory: works as expected
- file: works as expected most of the times; but when I rename the source folder & try copy/cut & paste again, renaming fails. if cut option is selected, the source files are getting deleted.

approving this for merge for now, since failure is happening only on an edge case (which most users wouldn't even notice, IMO) - @yatiksihag01 you can fix this in this PR if you can figure out why this happens from the top of your head, else, we can have a new issue & you can fix it later as you wish.

awesome work, once again!

(PS: sorry for the delayed review 😔)

VishalNehra · 2023-09-24T09:35:54Z

Write to us on telegram for a bounty on this issue thanks again for contributing 🙂

yatiksihag01 · 2023-09-24T16:57:36Z

file: works as expected most of the times; but when I rename the source folder & try copy/cut & paste again, renaming fails. if cut option is selected, the source files are getting deleted.

Hi @VishnuSanal, appreciate your feedback and approval. Could you provide more details on the issue and steps to reproduce it? Kindly open an issue and assign it to me. I'll work on a fix soon.

yatiksihag01 · 2023-09-24T17:00:48Z

Hi @VishalNehra, thank you for your kind offer of a bounty for my contribution but I did not expect any monetary rewards for this PR. I'm grateful for the opportunity to have contributed to the project:)

yatiksihag01 added 2 commits August 4, 2023 14:26

Disabled file modification during copy/paste. Users can now paste fil…

7a2c284

…es in the same folder.

Fixed issues which were causing spotlessCheck to fail.

69a8684

VishalNehra requested changes Aug 6, 2023

View reviewed changes

Created hasPendingPasteOperation() function to avoid code duplication

ead2973

yatiksihag01 requested a review from VishalNehra August 8, 2023 03:35

VishnuSanal requested changes Aug 9, 2023

View reviewed changes

Resolved the issue where child names were being changed instead of th…

5da1948

…e directory.

yatiksihag01 requested a review from VishnuSanal August 13, 2023 18:01

VishnuSanal requested changes Aug 16, 2023

View reviewed changes

yatiksihag01 added 2 commits August 17, 2023 09:27

Merge branch 'release/4.0' into bugfix/3886

ca6fcce

Resolved duplicate subdirectory creation issue.

aeb3286

yatiksihag01 marked this pull request as draft August 20, 2023 04:50

New PreparePasteTask class as an alternate of PrepareCopyTask class

47d9f47

yatiksihag01 requested a review from VishnuSanal September 3, 2023 14:50

Merge branch 'feature/2078' into bugfix/3886

17d8774

yatiksihag01 added 2 commits September 7, 2023 17:10

Merge branch 'release/4.0' into bugfix/3886

624f47a

Fixed issue where renaming was not working, removed PrepareCopyTask.j…

7b101b8

…ava, renaming will be done using FilenameHelper

Merge branch 'feature/2078' into bugfix/3886

83e38ff

yatiksihag01 marked this pull request as ready for review September 9, 2023 19:13

Merge branch 'release/4.0' into bugfix/3886

8aa3fc9

yatiksihag01 added 2 commits September 19, 2023 10:59

Fixes static code analysis issues, minor bugs.

4cf2a2d

Fixes new static code analysis issue 🥲

c3e69cf

VishnuSanal approved these changes Sep 24, 2023

View reviewed changes

VishalNehra approved these changes Sep 24, 2023

View reviewed changes

VishalNehra merged commit 6783e4d into TeamAmaze:release/4.0 Sep 24, 2023
3 checks passed

VishnuSanal mentioned this pull request Sep 25, 2023

[Debug Bug] Renaming a file before copying breaks File Renaming #3938

Closed

yatiksihag01 mentioned this pull request Sep 27, 2023

Fixes #3938 #3941

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #3886 #3898

Fixes #3886 #3898

yatiksihag01 commented Aug 4, 2023

VishalNehra Aug 6, 2023

TranceLove Aug 8, 2023

TranceLove Aug 23, 2023

VishnuSanal left a comment

yatiksihag01 commented Aug 9, 2023

yatiksihag01 commented Aug 13, 2023 •

edited

Loading

VishnuSanal commented Aug 13, 2023

VishnuSanal left a comment

yatiksihag01 commented Aug 16, 2023

yatiksihag01 commented Aug 17, 2023

VishnuSanal commented Sep 3, 2023 •

edited

Loading

yatiksihag01 commented Sep 5, 2023

VishnuSanal commented Sep 7, 2023

yatiksihag01 commented Sep 7, 2023 •

edited

Loading

VishalNehra commented Sep 18, 2023

VishalNehra commented Sep 18, 2023

yatiksihag01 commented Sep 18, 2023

VishalNehra commented Sep 18, 2023

VishalNehra commented Sep 20, 2023

VishalNehra commented Sep 20, 2023

yatiksihag01 commented Sep 20, 2023

VishnuSanal left a comment

VishalNehra commented Sep 24, 2023

yatiksihag01 commented Sep 24, 2023

yatiksihag01 commented Sep 24, 2023

Fixes #3886 #3898

Fixes #3886 #3898

Conversation

yatiksihag01 commented Aug 4, 2023

Description

Issue tracker

Automatic tests

Manual tests

Build tasks success

VishalNehra Aug 6, 2023

Choose a reason for hiding this comment

TranceLove Aug 8, 2023

Choose a reason for hiding this comment

TranceLove Aug 23, 2023

Choose a reason for hiding this comment

VishnuSanal left a comment

Choose a reason for hiding this comment

yatiksihag01 commented Aug 9, 2023

yatiksihag01 commented Aug 13, 2023 • edited Loading

VishnuSanal commented Aug 13, 2023

VishnuSanal left a comment

Choose a reason for hiding this comment

yatiksihag01 commented Aug 16, 2023

yatiksihag01 commented Aug 17, 2023

VishnuSanal commented Sep 3, 2023 • edited Loading

yatiksihag01 commented Sep 5, 2023

VishnuSanal commented Sep 7, 2023

yatiksihag01 commented Sep 7, 2023 • edited Loading

VishalNehra commented Sep 18, 2023

VishalNehra commented Sep 18, 2023

yatiksihag01 commented Sep 18, 2023

VishalNehra commented Sep 18, 2023

VishalNehra commented Sep 20, 2023

VishalNehra commented Sep 20, 2023

yatiksihag01 commented Sep 20, 2023

VishnuSanal left a comment

Choose a reason for hiding this comment

VishalNehra commented Sep 24, 2023

yatiksihag01 commented Sep 24, 2023

yatiksihag01 commented Sep 24, 2023

yatiksihag01 commented Aug 13, 2023 •

edited

Loading

VishnuSanal commented Sep 3, 2023 •

edited

Loading

yatiksihag01 commented Sep 7, 2023 •

edited

Loading