Place repeatedPassword after first check & remove unnecessary empty check

This commit is contained in:
Integral 2024-06-17 11:00:45 +08:00
parent 95dc80ddec
commit 992468d6c1
No known key found for this signature in database
GPG key ID: 06313911057DD5A8

View file

@ -2127,6 +2127,11 @@ UserSettingsModel::exportSessionKeys()
if (!ok) if (!ok)
return; return;
if (password.isEmpty()) {
QMessageBox::warning(nullptr, tr("Error"), tr("The password cannot be empty"));
return;
}
auto repeatedPassword = QInputDialog::getText(nullptr, auto repeatedPassword = QInputDialog::getText(nullptr,
tr("Repeat File Password"), tr("Repeat File Password"),
tr("Repeat the passphrase:"), tr("Repeat the passphrase:"),
@ -2136,16 +2141,6 @@ UserSettingsModel::exportSessionKeys()
if (!ok) if (!ok)
return; return;
if (password.isEmpty()) {
QMessageBox::warning(nullptr, tr("Error"), tr("The password cannot be empty"));
return;
}
if (repeatedPassword.isEmpty()) {
QMessageBox::warning(nullptr, tr("Error"), tr("Please repeat the password"));
return;
}
if (password != repeatedPassword) { if (password != repeatedPassword) {
QMessageBox::warning(nullptr, tr("Error"), tr("Passwords don't match")); QMessageBox::warning(nullptr, tr("Error"), tr("Passwords don't match"));
return; return;