Refactor DatabaseOpenWidget/Dialog and Auto-Type Database unlocking

src/CMakeLists.txt

@@ -123,8 +123,7 @@ set(keepassx_SOURCES
         gui/TotpSetupDialog.cpp
         gui/TotpDialog.cpp
         gui/TotpExportSettingsDialog.cpp
-        gui/UnlockDatabaseWidget.cpp
-        gui/UnlockDatabaseDialog.cpp
+        gui/DatabaseOpenDialog.cpp
         gui/WelcomeWidget.cpp
         gui/csvImport/CsvImportWidget.cpp
         gui/csvImport/CsvImportWizard.cpp

src/gui/DatabaseOpenDialog.cpp

@@ -0,0 +1,89 @@
+/*
+ *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "DatabaseOpenDialog.h"
+#include "DatabaseOpenWidget.h"
+#include "DatabaseWidget.h"
+#include "core/Database.h"
+
+DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
+    : QDialog(parent)
+    , m_view(new DatabaseOpenWidget(this))
+{
+    setWindowTitle(tr("Unlock Database - KeePassXC"));
+    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::ForeignWindow);
+    connect(m_view, SIGNAL(dialogFinished(bool)), this, SLOT(complete(bool)));
+}
+
+void DatabaseOpenDialog::setFilePath(const QString& filePath)
+{
+    m_view->load(filePath);
+}
+
+/**
+ * Set target DatabaseWidget to which signals are connected.
+ *
+ * @param dbWidget database widget
+ */
+void DatabaseOpenDialog::setTargetDatabaseWidget(DatabaseWidget* dbWidget)
+{
+    if (m_dbWidget) {
+        disconnect(this, nullptr, m_dbWidget, nullptr);
+    }
+    m_dbWidget = dbWidget;
+    connect(this, SIGNAL(dialogFinished(bool)), dbWidget, SLOT(unlockDatabase(bool)));
+}
+
+void DatabaseOpenDialog::setIntent(DatabaseOpenDialog::Intent intent)
+{
+    m_intent = intent;
+}
+
+DatabaseOpenDialog::Intent DatabaseOpenDialog::intent() const
+{
+    return m_intent;
+}
+
+void DatabaseOpenDialog::clearForms()
+{
+    m_view->clearForms();
+    m_db.reset();
+    m_intent = Intent::None;
+    if (m_dbWidget) {
+        disconnect(this, nullptr, m_dbWidget, nullptr);
+        m_dbWidget = nullptr;
+    }
+}
+
+QSharedPointer<Database> DatabaseOpenDialog::database()
+{
+    return m_db;
+}
+
+void DatabaseOpenDialog::complete(bool accepted)
+{
+    // save DB, since DatabaseOpenWidget will reset its data after accept() is called
+    m_db = m_view->database();
+
+    if (accepted) {
+        accept();
+    } else {
+        reject();
+    }
+    emit dialogFinished(accepted);
+    clearForms();
+}

src/gui/UnlockDatabaseDialog.h → src/gui/DatabaseOpenDialog.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,32 +18,47 @@
 #ifndef KEEPASSX_AUTOTYPEUNLOCKDIALOG_H
 #define KEEPASSX_AUTOTYPEUNLOCKDIALOG_H
 
-#include <QDialog>
-
-//#include <gui/DatabaseTabWidget.h>
-
 #include "core/Global.h"
 
-class UnlockDatabaseWidget;
+#include <QDialog>
+#include <QPointer>
+#include <QSharedPointer>
+
 class Database;
+class DatabaseWidget;
+class DatabaseOpenWidget;
 
-class UnlockDatabaseDialog : public QDialog
+class DatabaseOpenDialog : public QDialog
 {
     Q_OBJECT
+
 public:
-    explicit UnlockDatabaseDialog(QWidget* parent = nullptr);
+    enum class Intent
+    {
+        None,
+        AutoType,
+        Merge
+    };
+
+    explicit DatabaseOpenDialog(QWidget* parent = nullptr);
     void setFilePath(const QString& filePath);
-    void clearForms();
+    void setTargetDatabaseWidget(DatabaseWidget* dbWidget);
+    void setIntent(Intent intent);
+    Intent intent() const;
     QSharedPointer<Database> database();
+    void clearForms();
 
 signals:
-    void unlockDone(bool);
+    void dialogFinished(bool);
 
 public slots:
-    void complete(bool r);
+    void complete(bool accepted);
 
 private:
-    UnlockDatabaseWidget* const m_view;
+    QPointer<DatabaseOpenWidget> m_view;
+    QSharedPointer<Database> m_db;
+    QPointer<DatabaseWidget> m_dbWidget;
+    Intent m_intent = Intent::None;
 };
 
 #endif // KEEPASSX_AUTOTYPEUNLOCKDIALOG_H

src/gui/DatabaseTabWidget.cpp

@@ -28,22 +28,24 @@
 #include "core/Global.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
+#include "core/Tools.h"
 #include "format/CsvExporter.h"
 #include "gui/Clipboard.h"
 #include "gui/DatabaseWidget.h"
 #include "gui/DatabaseWidgetStateSync.h"
 #include "gui/DragTabBar.h"
 #include "gui/FileDialog.h"
 #include "gui/MessageBox.h"
-#include "gui/UnlockDatabaseDialog.h"
+#include "gui/DatabaseOpenDialog.h"
 #include "gui/entry/EntryView.h"
 #include "gui/group/GroupView.h"
 #include "gui/wizard/NewDatabaseWizard.h"
 
 DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
     : QTabWidget(parent)
     , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this))
-    , m_dbPendingLock(nullptr)
+    , m_dbWidgetPendingLock(nullptr)
+    , m_databaseOpenDialog(new DatabaseOpenDialog())
 {
     auto* tabBar = new DragTabBar(this);
     setTabBar(tabBar);
@@ -54,6 +56,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
     connect(this, SIGNAL(activateDatabaseChanged(DatabaseWidget*)), m_dbWidgetStateSync, SLOT(setActive(DatabaseWidget*)));
     connect(autoType(), SIGNAL(globalShortcutTriggered()), SLOT(performGlobalAutoType()));
     connect(autoType(), SIGNAL(autotypePerformed()), SLOT(relockPendingDatabase()));
+    connect(autoType(), SIGNAL(autotypeRejected()), SLOT(relockPendingDatabase()));
 }
 
 DatabaseTabWidget::~DatabaseTabWidget()
@@ -220,9 +223,9 @@ void DatabaseTabWidget::mergeDatabase()
     }
 }
 
-void DatabaseTabWidget::mergeDatabase(const QString& fileName)
+void DatabaseTabWidget::mergeDatabase(const QString& filePath)
 {
-    currentDatabaseWidget()->switchToOpenMergeDatabase(fileName);
+    unlockDatabaseInDialog(currentDatabaseWidget(), DatabaseOpenDialog::Intent::Merge, filePath);
 }
 
 void DatabaseTabWidget::importKeePass1Database()
@@ -513,23 +516,60 @@ void DatabaseTabWidget::lockDatabases()
     }
 }
 
+/**
+ * Unlock a database with an unlock popup dialog.
+ *
+ * @param dbWidget DatabaseWidget which to connect signals to
+ * @param intent intent for unlocking
+ */
+void DatabaseTabWidget::unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent)
+{
+    unlockDatabaseInDialog(dbWidget, intent, dbWidget->database()->filePath());
+}
+
+/**
+ * Unlock a database with an unlock popup dialog.
+ *
+ * @param dbWidget DatabaseWidget which to connect signals to
+ * @param intent intent for unlocking
+ * @param file path of the database to be unlocked
+ */
+void DatabaseTabWidget::unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent,
+                                               const QString& filePath)
+{
+    m_databaseOpenDialog->setTargetDatabaseWidget(dbWidget);
+    m_databaseOpenDialog->setIntent(intent);
+    m_databaseOpenDialog->setFilePath(filePath);
+
+#ifdef Q_OS_MACOS
+    if (intent == DatabaseOpenDialog::Intent::AutoType) {
+        autoType()->raiseWindow();
+        Tools::wait(500);
+    }
+#endif
+
+    m_databaseOpenDialog->show();
+    m_databaseOpenDialog->raise();
+    m_databaseOpenDialog->activateWindow();
+}
+
 /**
  * This function relock the pending database when autotype has been performed successfully
  * A database is marked as pending when it's unlocked after a global Auto-Type invocation
  */
 void DatabaseTabWidget::relockPendingDatabase()
 {
-    if (!m_dbPendingLock || !config()->get("security/relockautotype").toBool()) {
+    if (!m_dbWidgetPendingLock || !config()->get("security/relockautotype").toBool()) {
         return;
     }
 
-    if (m_dbPendingLock->isLocked() || !m_dbPendingLock->database()->hasKey()) {
-        m_dbPendingLock = nullptr;
+    if (m_dbWidgetPendingLock->isLocked() || !m_dbWidgetPendingLock->database()->hasKey()) {
+        m_dbWidgetPendingLock = nullptr;
         return;
     }
 
-    m_dbPendingLock->lock();
-    m_dbPendingLock = nullptr;
+    m_dbWidgetPendingLock->lock();
+    m_dbWidgetPendingLock = nullptr;
 }
 
 void DatabaseTabWidget::updateLastDatabases(const QString& filename)
@@ -579,11 +619,13 @@ void DatabaseTabWidget::performGlobalAutoType()
         }
     }
 
+    // TODO: allow for database selection during Auto-Type instead of using the current tab
     if (!unlockedDatabases.isEmpty()) {
         autoType()->performGlobalAutoType(unlockedDatabases);
     } else if (count() > 0) {
-        // TODO: allow for database selection during Auto-Type instead of using the first tab
-        m_dbPendingLock = databaseWidgetFromIndex(0);
-        m_dbPendingLock->prepareUnlock();
+        if (config()->get("security/relockautotype").toBool()) {
+            m_dbWidgetPendingLock = currentDatabaseWidget();
+        }
+        unlockDatabaseInDialog(currentDatabaseWidget(), DatabaseOpenDialog::Intent::AutoType);
     }
 }

src/gui/DatabaseTabWidget.h

@@ -19,6 +19,7 @@
 #define KEEPASSX_DATABASETABWIDGET_H
 
 #include "gui/MessageWidget.h"
+#include "DatabaseOpenDialog.h"
 
 #include <QTabWidget>
 #include <QPointer>
@@ -27,7 +28,6 @@ class Database;
 class DatabaseWidget;
 class DatabaseWidgetStateSync;
 class DatabaseOpenWidget;
-class QFile;
 
 class DatabaseTabWidget : public QTabWidget
 {
@@ -68,6 +68,8 @@ public slots:
 
     void lockDatabases();
     void closeDatabaseFromSender();
+    void unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent);
+    void unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent, const QString& filePath);
     void relockPendingDatabase();
 
     void changeMasterKey();
@@ -93,7 +95,8 @@ private slots:
     void updateLastDatabases(const QString& filename);
 
     QPointer<DatabaseWidgetStateSync> m_dbWidgetStateSync;
-    QPointer<DatabaseWidget> m_dbPendingLock;
+    QPointer<DatabaseWidget> m_dbWidgetPendingLock;
+    QScopedPointer<DatabaseOpenDialog> m_databaseOpenDialog;
 };
 
 #endif // KEEPASSX_DATABASETABWIDGET_H