Skip to content

Fix issues with drag&drop from special locations #9435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2022

Conversation

gave92
Copy link
Member

@gave92 gave92 commented Jun 19, 2022

Resolved / Related Issues
Items resolved / related issues by this PR.

  • Fixes an issue preventing drag & drop from phone storage
  • Fixes an issue causing a crash when dropping a file from a zip archive opened in Files and the destination already exists
  • Fixes wrong filename when copy-pasting from a zip file opened in explorer and the destination already exists

Details of Changes
Add details of changes here.

  • Fixed the GenerateUniquePath function so that a file named "test.txt" becomes "test (1).txt" instead of just "(1).txt" when copy-pasting from a zip file opened in explorer and the destination already exists.
  • Take the most recent result for each source file at the end of a file operation. Fixes a crash due to duplicate key when calling "ToDictionary()" on file operation results.
  • Removed dependency on associatedInstance from StorageHelpers. When drag&dropping the file does not come from the current instance. Fixes an issue preventing drag & drop from phone storage.

Validation
How did you test these changes?

  • Built and ran the app

Copy link
Member

@yaira2 yaira2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed needs - code review labels Jun 19, 2022
@yaira2 yaira2 merged commit c69e4e2 into files-community:main Jun 19, 2022
@gave92 gave92 deleted the zip_extract branch June 19, 2022 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Pull requests that are approved and ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants