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.

Sign up for GitHub

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

Jump to bottom

[stable-3.30] File Name Validator Improvements #13604

Merged
merged 9 commits into from
Sep 30, 2024
Merged

[stable-3.30] File Name Validator Improvements #13604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5cecc8
Translation improvements, no need nx version checks
alperozturk96 Sep 16, 2024
1967d0c
Code analytic fix
alperozturk96 Sep 16, 2024
6397356
Update app/src/main/res/values/strings.xml
rakekniven Sep 16, 2024
826b3a6
Version check needed no need try to parse empty array
alperozturk96 Sep 16, 2024
83ac410
Update tests
alperozturk96 Sep 17, 2024
4593332
Update app/src/main/res/values/strings.xml
alperozturk96 Sep 18, 2024
7be1b2c
Update app/src/main/res/values/strings.xml
alperozturk96 Sep 18, 2024
41105ea
Precise wording for spaces in filenames
rakekniven Sep 18, 2024
2a6771c
ci: check against sdtble-3.30
AndyScherzinger Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
assertEquals(null, result2)
} else {
assertEquals(
targetContext.getString(R.string.file_name_validator_error_forbidden_file_extensions, " "),
targetContext.getString(R.string.file_name_validator_error_forbidden_space_character_extensions),
result
)
assertEquals(
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,16 @@ object FileNameValidator {
forbiddenFilenameExtensionJson?.let {
for (forbiddenExtension in forbiddenFilenameExtension()) {
if (filename.endsWith(forbiddenExtension, ignoreCase = true)) {
return context.getString(
R.string.file_name_validator_error_forbidden_file_extensions,
forbiddenExtension
)
return if (forbiddenExtension == StringConstants.SPACE) {
context.getString(
R.string.file_name_validator_error_forbidden_space_character_extensions
)
} else {
context.getString(
R.string.file_name_validator_error_forbidden_file_extensions,
forbiddenExtension
)
}
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,13 +1227,14 @@
<string name="unified_search_fragment_calendar_event_not_found">Event not found, you can always sync to update. Redirecting to web…</string>
<string name="unified_search_fragment_contact_not_found">Contact not found, you can always sync to update. Redirecting to web…</string>
<string name="unified_search_fragment_permission_needed">Permissions are required to open search result otherwise it will redirected to web…</string>
<string name="file_name_validator_current_path_is_invalid">Current folder name is invalid, please rename the folder. Redirecting to root</string>
<string name="file_name_validator_current_path_is_invalid">Current folder name is invalid, please rename the folder. Redirecting home…</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Please rename the file before moving or copying</string>
<string name="file_name_validator_upload_content_error">Some contents cannot able to uploaded due to contains reserved names or invalid character</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Folder path contains reserved names or invalid character</string>
<string name="file_name_validator_error_invalid_character">Name contains an invalid character: %s</string>
<string name="file_name_validator_upload_content_error">Some content cannot be uploaded since it contains reserved names or invalid characters</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Folder path contains reserved names or invalid characters</string>
<string name="file_name_validator_error_invalid_character">Name contains invalid characters: %s</string>
<string name="file_name_validator_error_reserved_names">%s is a forbidden name</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s is a forbidden file extension</string>
<string name="file_name_validator_error_forbidden_space_character_extensions">Filenames must not contain spaces at the beginning or end</string>
<string name="sync">Sync</string>
<string name="please_select_a_server">Please select a server…</string>
</resources>
2 changes: 1 addition & 1 deletion scripts/analysis/analysis-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BUILD_NUMBER=$4
PR_NUMBER=$5


stableBranch="master"
stableBranch="stable-3.30"
repository="android"

ruby scripts/analysis/lint-up.rb
Expand Down
Loading