From f49a8a7f70fd5cdf0da6ed555c651bfcc2cbe8ca Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Tue, 2 Apr 2019 00:01:58 +0200
Subject: [PATCH] Fix key component widget initialization and password field
 echo mode on database open

---
 src/gui/DatabaseOpenWidget.cpp           |  6 ++----
 src/gui/masterkey/KeyComponentWidget.cpp | 20 ++++++++++++++------
 src/gui/masterkey/KeyComponentWidget.h   |  5 ++++-
 src/gui/masterkey/PasswordEditWidget.cpp |  3 +++
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index c7237a36..0f540bca 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -185,9 +185,7 @@ void DatabaseOpenWidget::openDatabase()
         return;
     }
 
-    if (!m_ui->editPassword->isPasswordVisible()) {
-        m_ui->editPassword->setShowPassword(false);
-    }
+    m_ui->editPassword->setShowPassword(false);
     QCoreApplication::processEvents();
 
     m_db.reset(new Database());
@@ -369,7 +367,7 @@ void DatabaseOpenWidget::pollYubikey()
     m_ui->checkChallengeResponse->setChecked(false);
     m_ui->comboChallengeResponse->setEnabled(false);
     m_ui->comboChallengeResponse->clear();
-    m_ui->comboChallengeResponse->addItem(tr("-- SELECT --"), -1);
+    m_ui->comboChallengeResponse->addItem(tr("Select slot..."), -1);
     m_ui->yubikeyProgress->setVisible(true);
 
     // YubiKey init is slow, detect asynchronously to not block the UI
diff --git a/src/gui/masterkey/KeyComponentWidget.cpp b/src/gui/masterkey/KeyComponentWidget.cpp
index 7d795aca..da362a95 100644
--- a/src/gui/masterkey/KeyComponentWidget.cpp
+++ b/src/gui/masterkey/KeyComponentWidget.cpp
@@ -37,7 +37,7 @@ KeyComponentWidget::KeyComponentWidget(const QString& name, QWidget* parent)
     connect(m_ui->removeButton, SIGNAL(clicked(bool)), SIGNAL(componentRemovalRequested()));
     connect(m_ui->cancelButton, SIGNAL(clicked(bool)), SLOT(cancelEdit()));
 
-    connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(reset()));
+    connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(resetComponentEditWidget()));
 
     connect(this, SIGNAL(nameChanged(QString)), SLOT(updateComponentName(QString)));
     connect(this, SIGNAL(descriptionChanged(QString)), SLOT(updateComponentDescription(QString)));
@@ -46,11 +46,13 @@ KeyComponentWidget::KeyComponentWidget(const QString& name, QWidget* parent)
     connect(this, SIGNAL(componentRemovalRequested()), SLOT(doRemove()));
     connect(this, SIGNAL(componentAddChanged(bool)), SLOT(updateAddStatus(bool)));
 
-    blockSignals(true);
+    bool prev = blockSignals(true);
     setComponentName(name);
+    blockSignals(prev);
+
+    prev = m_ui->stackedWidget->blockSignals(true);
     m_ui->stackedWidget->setCurrentIndex(Page::AddNew);
-    updateSize();
-    blockSignals(false);
+    m_ui->stackedWidget->blockSignals(prev);
 }
 
 KeyComponentWidget::~KeyComponentWidget()
@@ -164,9 +166,15 @@ void KeyComponentWidget::cancelEdit()
     emit editCanceled();
 }
 
-void KeyComponentWidget::reset()
+void KeyComponentWidget::showEvent(QShowEvent* event)
 {
-    if (static_cast<Page>(m_ui->stackedWidget->currentIndex()) == Page::Edit) {
+    QWidget::showEvent(event);
+    resetComponentEditWidget();
+}
+
+void KeyComponentWidget::resetComponentEditWidget()
+{
+    if (m_ui->componentWidgetLayout->isEmpty() || static_cast<Page>(m_ui->stackedWidget->currentIndex()) == Page::Edit) {
         if (!m_ui->componentWidgetLayout->isEmpty()) {
             auto* item = m_ui->componentWidgetLayout->takeAt(0);
             if (item->widget()) {
diff --git a/src/gui/masterkey/KeyComponentWidget.h b/src/gui/masterkey/KeyComponentWidget.h
index cf2ae494..f184c132 100644
--- a/src/gui/masterkey/KeyComponentWidget.h
+++ b/src/gui/masterkey/KeyComponentWidget.h
@@ -109,6 +109,9 @@ signals:
     void editCanceled();
     void componentRemovalRequested();
 
+protected:
+    void showEvent(QShowEvent* event) override ;
+
 private slots:
     void updateComponentName(const QString& name);
     void updateComponentDescription(const QString& decription);
@@ -117,7 +120,7 @@ private slots:
     void doEdit();
     void doRemove();
     void cancelEdit();
-    void reset();
+    void resetComponentEditWidget();
     void updateSize();
 
 private:
diff --git a/src/gui/masterkey/PasswordEditWidget.cpp b/src/gui/masterkey/PasswordEditWidget.cpp
index 6f6cf4d9..de00199b 100644
--- a/src/gui/masterkey/PasswordEditWidget.cpp
+++ b/src/gui/masterkey/PasswordEditWidget.cpp
@@ -94,8 +94,11 @@ void PasswordEditWidget::initComponentEditWidget(QWidget* widget)
 
 void PasswordEditWidget::hideEvent(QHideEvent* event)
 {
+    Q_ASSERT(m_compUi->enterPasswordEdit);
+
     if (!isVisible() && m_compUi->enterPasswordEdit) {
         m_compUi->enterPasswordEdit->setText("");
+        m_compUi->repeatPasswordEdit->setText("");
     }
 
     QWidget::hideEvent(event);