Skip to content

Commit

Permalink
Database key settings: fix UI bug
Browse files Browse the repository at this point in the history
Fix a bug in the database key settings dialog, where it was previously
always incorrectly applying an empty password if the password was not
changed but some other change was made (e.g. adding or removing a key
file).
  • Loading branch information
c4rlo authored and droidmonkey committed Jun 29, 2024
1 parent 0a516d5 commit 8544590
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/gui/databasekey/PasswordEditWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool PasswordEditWidget::isPasswordVisible() const

bool PasswordEditWidget::isEmpty() const
{
return visiblePage() != Page::Edit || m_compUi->enterPasswordEdit->text().isEmpty();
return m_compUi->enterPasswordEdit->text().isEmpty();
}

PasswordHealth::Quality PasswordEditWidget::getPasswordQuality() const
Expand Down
6 changes: 4 additions & 2 deletions src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ bool DatabaseSettingsWidgetDatabaseKey::saveSettings()
}

// Show warning if database password has not been set
if (m_passwordEditWidget->visiblePage() == KeyComponentWidget::Page::AddNew || m_passwordEditWidget->isEmpty()) {
if (m_passwordEditWidget->visiblePage() == KeyComponentWidget::Page::AddNew
|| (m_passwordEditWidget->visiblePage() == KeyComponentWidget::Page::Edit && m_passwordEditWidget->isEmpty())) {

QScopedPointer<QMessageBox> msgBox(new QMessageBox(this));
msgBox->setIcon(QMessageBox::Warning);
msgBox->setWindowTitle(tr("No password set"));
Expand All @@ -179,7 +181,7 @@ bool DatabaseSettingsWidgetDatabaseKey::saveSettings()
return false;
}

if (!m_passwordEditWidget->isEmpty()) {
if (m_passwordEditWidget->visiblePage() == KeyComponentWidget::Page::Edit && !m_passwordEditWidget->isEmpty()) {
// Prevent setting password with a quality less than the minimum required
auto minQuality = qBound(0, config()->get(Config::Security_DatabasePasswordMinimumQuality).toInt(), 4);
if (m_passwordEditWidget->getPasswordQuality() < static_cast<PasswordHealth::Quality>(minQuality)) {
Expand Down

0 comments on commit 8544590

Please sign in to comment.