Skip to content

Check empty/same name on creating text files #10537

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

Merged
AlvaroBrey merged 1 commit into from
Aug 5, 2022
Merged

Check empty/same name on creating text files #10537

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
43 changes: 19 additions & 24 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 @@ -70,6 +70,8 @@ import javax.inject.Inject
*/
class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, TemplateAdapter.ClickListener, Injectable {

private lateinit var fileNames: List<String>

@Inject
lateinit var clientFactory: ClientFactory

Expand Down Expand Up @@ -116,6 +118,7 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
)
button.setOnClickListener(this)
button.isEnabled = false
button.isClickable = false

positiveButton = button
checkEnablingCreateButton()
Expand All @@ -133,7 +136,7 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
else -> savedInstanceState.getString(ARG_HEADLINE)
}

val fileNames = fileDataStorageManager.getFolderContent(parentFolder, false).map { it.fileName }
fileNames = fileDataStorageManager.getFolderContent(parentFolder, false).map { it.fileName }

// Inflate the layout for the dialog
val inflater = requireActivity().layoutInflater
Expand All @@ -147,15 +150,12 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
themeColorUtils.primaryColor(context),
themeColorUtils.primaryAccentColor(context)
)
binding.filename.setOnKeyListener { _, _, _ ->
checkEnablingCreateButton()
false
}

binding.filename.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) = Unit

override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
checkExistingFilename(fileNames)
// not needed
}

override fun afterTextChanged(s: Editable) {
Expand Down Expand Up @@ -259,26 +259,21 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
private fun checkEnablingCreateButton() {
if (positiveButton != null) {
val selectedTemplate = adapter!!.selectedTemplate
val name = binding.filename.text.toString()
positiveButton!!.isEnabled = selectedTemplate != null && name.isNotEmpty() &&
!name.equals(DOT + selectedTemplate.extension, ignoreCase = true)
}
}
val name = binding.filename.text.toString().trim()
val isNameEmpty = name.isEmpty() || name.equals(DOT + selectedTemplate.extension, ignoreCase = true)
val state = selectedTemplate != null && !isNameEmpty && !fileNames.contains(name)

private fun checkExistingFilename(fileNames: List<String>) {
var newFileName = ""
if (binding.filename.text != null) {
newFileName = binding.filename.text.toString().trim()
}
positiveButton?.isEnabled = state
positiveButton?.isClickable = state
binding.filenameContainer.isErrorEnabled = !state

if (fileNames.contains(newFileName)) {
binding.filenameContainer.error = getText(R.string.file_already_exists)
positiveButton?.isEnabled = false
} else if (binding.filenameContainer.error != null) {
binding.filenameContainer.error = null
// Called to remove extra padding
binding.filenameContainer.isErrorEnabled = false
positiveButton?.isEnabled = true
if (!state) {
if (isNameEmpty) {
binding.filenameContainer.error = getText(R.string.filename_empty)
} else {
binding.filenameContainer.error = getText(R.string.file_already_exists)
}
}
}
}

Expand Down