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

Implemented #sanitizedCanonicalPath method #6404

Merged
merged 9 commits into from
Oct 1, 2024

Conversation

grzesiek2010
Copy link
Member

@grzesiek2010 grzesiek2010 commented Sep 9, 2024

Work towards #6364

Why is this the best possible solution? Were any other approaches considered?

As discussed in the issue, the goal of this PR is to determine whether other parts of the path can also change after calling File.getCanonicalPath, or if it's always the /Android/data/ part. Once we have the answer, we can implement the final solution.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

I think it doesn't require testing. Once carefully reviewed it can be merged.

Do we need any specific form for testing your changes? If so, please attach one.

No.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

No.

Before submitting this PR, please make sure you have:

  • added or modified tests for any new or changed behavior
  • run ./gradlew connectedAndroidTest (or ./gradlew testLab) and confirmed all checks still pass
  • added a comment above any new strings describing it for translators
  • added any new strings with date formatting to DateFormatsTest
  • verified that any code or assets from external sources are properly credited in comments and/or in the about file.
  • verified that any new UI elements use theme colors. UI Components Style guidelines


if (canonicalPath.contains(androidDataSegment, true)) {
val regex = Regex(androidDataSegment, RegexOption.IGNORE_CASE)
return canonicalPath.replace(regex, androidDataSegment)
Copy link
Member

Choose a reason for hiding this comment

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

I think you should be able to do the replace without a contains check -- if there's no match it just won't be replaced.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point.

@grzesiek2010 grzesiek2010 marked this pull request as ready for review September 9, 2024 17:55
@grzesiek2010 grzesiek2010 merged commit cff7a1e into getodk:master Oct 1, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants