diff --git a/app/src/main/kotlin/org/fossify/voicerecorder/dialogs/FilenamePatternDialog.kt b/app/src/main/kotlin/org/fossify/voicerecorder/dialogs/FilenamePatternDialog.kt index 84af7a90..909c49c0 100644 --- a/app/src/main/kotlin/org/fossify/voicerecorder/dialogs/FilenamePatternDialog.kt +++ b/app/src/main/kotlin/org/fossify/voicerecorder/dialogs/FilenamePatternDialog.kt @@ -3,6 +3,7 @@ package org.fossify.voicerecorder.dialogs import androidx.appcompat.app.AlertDialog import androidx.core.widget.doAfterTextChanged import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.isAValidFilename import org.fossify.commons.extensions.setupDialogStuff import org.fossify.commons.extensions.viewBinding import org.fossify.voicerecorder.R @@ -26,7 +27,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca true } - filenamePatternValue.doAfterTextChanged { validatePattern(it?.toString().orEmpty()) } + filenamePatternValue.doAfterTextChanged { validatePattern(it?.toString().orEmpty().trim()) } } activity.getAlertDialogBuilder() @@ -36,7 +37,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca activity.setupDialogStuff(binding.root, this, R.string.filename_pattern) { alertDialog -> dialog = alertDialog alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - val newPattern = binding.filenamePatternValue.text.toString() + val newPattern = binding.filenamePatternValue.text.toString().trim() config.filenamePattern = newPattern callback(newPattern) alertDialog.dismiss() @@ -48,6 +49,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca private fun validatePattern(pattern: String) { binding.filenamePatternHint.error = when { pattern.isEmpty() -> activity.getString(org.fossify.commons.R.string.filename_cannot_be_empty) + !pattern.isAValidFilename() -> activity.getString(org.fossify.commons.R.string.invalid_name) !containsAllDateTimePlaceholders(pattern) -> activity.getString(R.string.filename_pattern_must_contain_all) else -> null }