Restored files can have incorrect names if there were at least two files in the rubbish bin with the same name

[colinkiama]

What Happened?

I created two files with the same name and moved them both to the rubbish bin.

I then restored one of the files from the rubbish bin. They came back with a modified name e.g file.2.txt. The original name of the file was file.txt.

Steps to Reproduce

1. Open the files app
2. Navigate to your "Downloads" folder
3. Use context menu to create a new empty file
4. Call it "file.txt"
5. Move "file.txt" to the Rubbish Bin
6. Navigate to your "Documents" folder
7. Repeat steps 3,4 and 5
8. Navigate to Rubbish Bin, you'll notice at least 2 files named "file.txt".
9. Select the "file.txt" file that displays "file.2.txt" or any name in the format "file.{number}.txt" in the info popup on the bottom of the screen when you select the file
10. Restore the file
11. When you to the destination of the restored file (in this case the "Documents" folder), you'll see that the file no longer has the "file.txt" name anymore, it's "file.2.txt" or modified with another number.

Expected Behavior

The restored file should return to it's destination with the name it had when it was deleted "file.txt".

OS Version

7.x (Horus)

Software Version

Latest release (I have run all updates)

Log Output

No response

Hardware Info

No response

[jeremypw]

Hmm, seems like the actual name in the trash folder is being restored rather than the original name. The properties window and overlaybar also use the actual name (because they are not aware that the folder is a trash folder)

[jeremypw]

This is rather tricky to fix - my first attempt ran into all sorts of problems.