Skip to content
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

fix: Handle selecting files and folders for patch options correctly #1941

Merged
merged 5 commits into from
Jun 29, 2024

Conversation

Francesco146
Copy link

fixes #1703

@Francesco146

This comment was marked as resolved.

@Francesco146
Copy link
Author

ready for review

@Ushie Ushie changed the base branch from main to dev June 10, 2024 19:33
Co-authored-by: inotia00 <108592928+inotia00@users.noreply.github.com>
@Francesco146
Copy link
Author

update:

this PR has been merged in RVX Manager, many people have already tested it and it has no problems

Copy link
Member

@validcube validcube left a comment

Choose a reason for hiding this comment

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

📝 Review: Analysis & Formating

(Note-to-self: Revisit this to test on physical devices when have time.)

@Francesco146
Copy link
Author

(Note-to-self: Revisit this to test on physical devices when have time.)

i tested the latest commit with an Android 14 virtual emulator, 10+ should be covered. consider testing on Android 9

@Francesco146
Copy link
Author

tested on AVD Android 9. working as expected

@oSumAtrIX oSumAtrIX changed the title feat: Add file and folder selection functionality fix: Select file paths correctly Jun 29, 2024
@oSumAtrIX oSumAtrIX changed the title fix: Select file paths correctly fix: Handle selecting files and folders for patch options correctly Jun 29, 2024
@oSumAtrIX oSumAtrIX merged commit b26760b into ReVanced:dev Jun 29, 2024
1 check passed
@Francesco146 Francesco146 deleted the paths branch June 29, 2024 12:36
@kitadai31
Copy link
Contributor

kitadai31 commented Jun 30, 2024

I tried this but it's currently broken...
There are mistakes when resolved a conflict

5c68d51 added a new import, but it was deleted by this merge, so build fails.

Also, 5c68d51 changed a value strings of PopupMenuItem, but this change was lost while resolving conflict. (204cb3a)
As a result, when I press "Select file path" or "Select folder", nothing happens.

@Francesco146
Copy link
Author

should I open another PR? conflict resolution was not included in the goal of this PR

@Ushie
Copy link
Member

Ushie commented Jun 30, 2024

Yes, open one please

github-actions bot pushed a commit that referenced this pull request Jun 30, 2024
# [1.21.0-dev.6](v1.21.0-dev.5...v1.21.0-dev.6) (2024-06-30)

### Bug Fixes

* Add missing import to patch options field ([d60f9aa](d60f9aa))
* Follow system theme immediately ([#1942](#1942)) ([694f2a9](694f2a9))
* Handle selecting files and folders for patch options correctly ([#1941](#1941)) ([b26760b](b26760b))
* Increase dashboard RefreshIndicator edge offset ([#1859](#1859)) ([232b702](232b702))
* Select previously applied patches when loading patch selection ([#1865](#1865)) ([7ef8f04](7ef8f04))
* Unsupported patch toast says "patchItem.unsupportedPatchVersion" ([#2011](#2011)) ([3209c0e](3209c0e))

### Features

* Save last patched app ([#1414](#1414)) ([7720408](7720408))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

bug: Can't select file paths
6 participants