Skip to content

Fix issue #4304 #4316

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
enescakar2148 wants to merge 5 commits into
base: release/4.0
Choose a base branch
from
Open

Fix issue #4304 #4316

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88612e2
Fix issue #4304 - The cause of the error is that the password validat…
enescakar2148 Dec 27, 2024
844d568
Fix formatting issues with Spotless
enescakar2148 Dec 27, 2024
c379702
change updateBuildConfiguration: automatic
enescakar2148 Dec 30, 2024
b9e6428
edit
enescakar2148 Dec 31, 2024
c9cce1c
Merge branch 'release/4.0' into fix-password-validation
EmmanuelMess May 21, 2025
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
21 changes: 13 additions & 8 deletions app/src/main/java/com/amaze/filemanager/ui/dialogs/EncryptAuthenticateDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,20 @@ object EncryptAuthenticateDialog {
warningTextInputLayout,
btnOK,
) { text: String ->
if (text.isNotBlank() &&
text == comparingPasswordField.text.toString() &&
filenameIsValid(encryptSaveAsEditText.text.toString(), useAzeEncrypt)
) {
ReturnState()
} else if (text.isBlank()) {
ReturnState(STATE_ERROR, R.string.field_empty)
if (text.isNotBlank()) {
if (comparingPasswordField.text.toString().isBlank() ||
text == comparingPasswordField.text.toString()
) {
if (filenameIsValid(encryptSaveAsEditText.text.toString(), useAzeEncrypt)) {
ReturnState()
} else {
ReturnState(STATE_ERROR, R.string.empty_string)
}
} else {
ReturnState(STATE_ERROR, R.string.password_no_match)
}
} else {
ReturnState(STATE_ERROR, R.string.password_no_match)
ReturnState(STATE_ERROR, R.string.field_empty)
}
}

Expand Down
Loading