Skip to content

Forbid to change extension with template #16523

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

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −4
Open

Forbid to change extension with template #16523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ...src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ class ChooseRichDocumentsTemplateDialogFragment :
ignoreCase = true
)
)
val isEnable = isExtension && errorMessage == null
val isChangedExtension = name.substringAfterLast(DOT) != selectedTemplate?.extension

val isEnable = isExtension && !isChangedExtension && errorMessage == null

positiveButton?.let {
it.isEnabled = isEnable
Expand All @@ -320,7 +322,11 @@ class ChooseRichDocumentsTemplateDialogFragment :
binding.filenameContainer.run {
isErrorEnabled = !isEnable
error = if (!isEnable) {
errorMessage ?: getText(R.string.filename_empty)
when {
errorMessage != null -> errorMessage
isChangedExtension -> getString(R.string.extension_cannot_be_changed)
else -> getText(R.string.filename_empty)
}
} else {
null
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,16 +275,18 @@ class ChooseTemplateDialogFragment :

val isNameValid = (errorMessage == null) && !name.equals(DOT + selectedTemplate?.extension, ignoreCase = true)
val isHiddenFileName = FileNameValidator.isFileHidden(name)
val isChangedExtension = name.substringAfterLast(DOT) != selectedTemplate?.extension

binding.filenameContainer.isErrorEnabled = !isNameValid || isHiddenFileName
binding.filenameContainer.isErrorEnabled = !isNameValid || isHiddenFileName || isChangedExtension
binding.filenameContainer.error = when {
!isNameValid -> errorMessage ?: getString(R.string.enter_filename)
isHiddenFileName -> getText(R.string.hidden_file_name_warning)
isChangedExtension -> getString(R.string.extension_cannot_be_changed)
else -> null
}

positiveButton?.apply {
isEnabled = isNameValid && !isHiddenFileName
isEnabled = isNameValid && !isHiddenFileName && !isChangedExtension
isClickable = isEnabled
}
}
Expand Down
1 change: 1 addition & 0 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 @@ -1504,4 +1504,5 @@
<string name="sync_conflict_notification_title">File upload conflicts</string>
<string name="sync_conflict_notification_description">Upload conflicts detected. Open uploads to resolve.</string>
<string name="sync_conflict_notification_action_title">Resolve conflicts</string>
<string name="extension_cannot_be_changed">Extension cannot be changed</string>
</resources>
Loading