mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-21 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13577 from nextcloud/file-name-validator-improvements

Browse source 
File Name Validator Improvements
This commit is contained in:
Alper Öztürk 2024-09-18 20:56:16 +02:00 committed by GitHub
commit b0fc628cb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/com/nextcloud/utils/FileNameValidatorTests.kt
View file

@ -81,7 +81,7 @@ class FileNameValidatorTests : AbstractOnServerIT() {
assertEquals(null, result2) assertEquals(null, result2)
} else { } else {
assertEquals( 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 result
) )
assertEquals( assertEquals(

14
app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt
View file

@ -86,10 +86,16 @@ object FileNameValidator {
forbiddenFilenameExtensionJson?.let { forbiddenFilenameExtensionJson?.let {
for (forbiddenExtension in forbiddenFilenameExtension()) { for (forbiddenExtension in forbiddenFilenameExtension()) {
if (filename.endsWith(forbiddenExtension, ignoreCase = true)) { if (filename.endsWith(forbiddenExtension, ignoreCase = true)) {
return context.getString( return if (forbiddenExtension == StringConstants.SPACE) {
R.string.file_name_validator_error_forbidden_file_extensions, context.getString(
forbiddenExtension R.string.file_name_validator_error_forbidden_space_character_extensions
) )
} else {
context.getString(
R.string.file_name_validator_error_forbidden_file_extensions,
forbiddenExtension
)
}
} }
} }
} }

9
app/src/main/res/values/strings.xml
View file

@ -1235,13 +1235,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_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_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="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_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_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 character</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 an invalid character: %s</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_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_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="sync">Sync</string>
<string name="please_select_a_server">Please select a server…</string> <string name="please_select_a_server">Please select a server…</string>
</resources> </resources>