Added MainWindow::makeKeychainBackup()

Author: CodeShark

src/mainwindow.cpp

@@ -885,6 +885,68 @@ void MainWindow::setKeychainPassphrase()
     }
 }
 
+int MainWindow::makeKeychainBackup(const QString& keychainName)
+{
+    QString name;
+    bool bLocked;
+    if (keychainName.isEmpty())
+    {
+        QModelIndex index = keychainSelectionModel->currentIndex();
+        int row = index.row();
+        if (row < 0) {
+            showError(tr("No keychain is selected."));
+            return QDialog::Rejected;
+        }
+
+        if (!keychainModel->hasSeed(row))
+        {
+            showError(tr("Keychain does not contain seed."));
+            return QDialog::Rejected;
+        }
+
+        int status = keychainModel->getStatus(row);
+        bLocked = status == KeychainModel::LOCKED;
+
+        QStandardItem* nameItem = keychainModel->item(row, 0);
+        name = nameItem->data(Qt::DisplayRole).toString();
+    }
+    else
+    {
+        if (!keychainModel->exists(keychainName))
+        {
+            showError(tr("Keychain not found."));
+            return QDialog::Rejected;
+        }
+
+        bLocked = keychainModel->isLocked(keychainName);
+
+        name = keychainName;
+    } 
+
+    try
+    {
+        if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
+        CoinDB::VaultLock lock(synchedVault);
+        if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
+
+        if (bLocked && !unlockKeychain(name)) return QDialog::Rejected;
+
+        secure_bytes_t seed = synchedVault.getVault()->exportBIP39(name.toStdString());
+
+        KeychainBackupWizard wizard(name, seed, this);
+        if (bLocked) { lockKeychain(name); }
+        return wizard.exec();
+    }
+    catch (const exception& e)
+    {
+        LOGGER(error) << "MainWindow::makeKeychainBackup - " << e.what() << std::endl;
+        if (bLocked) { lockKeychain(name); }
+        showError(e.what());
+    }
+
+    return QDialog::Rejected;
+}
+
 void MainWindow::importKeychain(QString fileName)
 {
     if (fileName.isEmpty()) {
@@ -1136,39 +1198,6 @@ void MainWindow::viewBIP39()
     }
 }
 
-void MainWindow::backupKeychain()
-{
-    QModelIndex index = keychainSelectionModel->currentIndex();
-    int row = index.row();
-    if (row < 0) {
-        showError(tr("No keychain is selected."));
-        return;
-    }
-
-    QStandardItem* nameItem = keychainModel->item(row, 0);
-    QString name = nameItem->data(Qt::DisplayRole).toString();
-
-    try {
-        bytes_t extendedKey;
-
-        if (keychainModel->isPrivate(name)) {
-            // TODO: prompt user for decryption key
-            extendedKey = keychainModel->getExtendedKeyBytes(name, true);
-        }
-        else {
-            extendedKey = keychainModel->getExtendedKeyBytes(name);
-        }
-
-        KeychainBackupDialog dlg(tr("Keychain information"));
-        dlg.setExtendedKey(extendedKey);
-        dlg.exec();
-    }
-    catch (const exception& e) {
-        LOGGER(debug) << "MainWindow::backupKeychain - " << e.what() << std::endl;
-        showError(e.what());
-    }
-}
-
 void MainWindow::updateCurrentKeychain(const QModelIndex& current, const QModelIndex& /*previous*/)
 {
     int row = current.row();
@@ -1178,11 +1207,10 @@ void MainWindow::updateCurrentKeychain(const QModelIndex& current, const QModelI
         viewPrivateBIP32Action->setEnabled(false);
         viewPublicBIP32Action->setEnabled(false);
         viewBIP39Action->setEnabled(false);
-        backupKeychainAction->setEnabled(false);
     }
     else {
         int status = keychainModel->getStatus(row);
-        bool hasSeed = keychainModel->hasSeed(row); 
+        bool hasSeed = keychainModel->hasSeed(row);
 
         unlockKeychainAction->setEnabled(status == KeychainModel::LOCKED);
         lockKeychainAction->setEnabled(status == KeychainModel::UNLOCKED);
@@ -1192,7 +1220,7 @@ void MainWindow::updateCurrentKeychain(const QModelIndex& current, const QModelI
         viewPrivateBIP32Action->setEnabled(status != KeychainModel::PUBLIC);
         viewPublicBIP32Action->setEnabled(true);
         viewBIP39Action->setEnabled(status != KeychainModel::PUBLIC && hasSeed);
-        backupKeychainAction->setEnabled(true);
+        makeKeychainBackupAction->setEnabled(status != KeychainModel::PUBLIC && hasSeed);
     }
 }
 
@@ -2084,6 +2112,11 @@ void MainWindow::createActions()
     setKeychainPassphraseAction->setEnabled(false);
     connect(setKeychainPassphraseAction, SIGNAL(triggered()), this, SLOT(setKeychainPassphrase()));
 
+    makeKeychainBackupAction = new QAction(tr("Make Keychain Backup..."), this);
+    makeKeychainBackupAction->setStatusTip(tr("Open keychain backup wizard"));
+    makeKeychainBackupAction->setEnabled(false);
+    connect(makeKeychainBackupAction, SIGNAL(triggered()), this, SLOT(makeKeychainBackup()));
+
     importPrivateAction = new QAction(tr("Private Imports"), this);
     importPrivateAction->setCheckable(true);
     importPrivateAction->setStatusTip(tr("Import private keys if available"));
@@ -2140,11 +2173,6 @@ void MainWindow::createActions()
     viewBIP39Action->setEnabled(false);
     connect(viewBIP39Action, SIGNAL(triggered()), this, SLOT(viewBIP39()));
 
-    backupKeychainAction = new QAction(tr("Backup Keychain..."), this);
-    backupKeychainAction->setStatusTip(tr("Make paper backup"));
-    backupKeychainAction->setEnabled(false);
-    connect(backupKeychainAction, SIGNAL(triggered()), this, SLOT(backupKeychain()));
-
     // account actions
     quickNewAccountAction = new QAction(QIcon(":/icons/magicwand.png"), tr("Account &Wizard..."), this);
     quickNewAccountAction->setStatusTip(tr("Create a new account, automatically create new keychains for it"));
@@ -2354,6 +2382,9 @@ void MainWindow::createMenus()
     keychainMenu->addAction(lockKeychainAction);
     keychainMenu->addAction(lockAllKeychainsAction);
     keychainMenu->addAction(setKeychainPassphraseAction);
+    keychainMenu->addSeparator();
+    keychainMenu->addAction(makeKeychainBackupAction);
+
 /*
     keychainMenu->addSeparator()->setText(tr("Import Mode"));
     keychainMenu->addAction(importPrivateAction);
@@ -2377,10 +2408,6 @@ void MainWindow::createMenus()
 
     keychainMenu->addSeparator();
     keychainMenu->addAction(quickNewAccountAction);
-/*
-    keychainMenu->addSeparator();
-    keychainMenu->addAction(backupKeychainAction);
-*/
 
     networkMenu = menuBar()->addMenu(tr("&Network"));
     networkMenu->addAction(connectAction);

src/mainwindow.h

@@ -142,13 +142,13 @@ private slots:
     void lockKeychain(QString name = QString());
     void lockAllKeychains();
     void setKeychainPassphrase();
+    int  makeKeychainBackup(const QString& keychainName = QString());
     void importKeychain(QString fileName = QString());
     void exportKeychain(bool exportPrivate);
     void importBIP32();
     void viewBIP32(bool viewPrivate);
     void importBIP39();
     void viewBIP39();
-    void backupKeychain();
 //    void mergeKeychains();
 //    void removeKeychain();
 //    void renameKeychain();
@@ -294,6 +294,7 @@ private slots:
     QAction* lockKeychainAction;
     QAction* lockAllKeychainsAction;
     QAction* setKeychainPassphraseAction;
+    QAction* makeKeychainBackupAction;
     bool     importPrivate;
     QAction* importPrivateAction;
     QAction* importPublicAction;
@@ -306,7 +307,6 @@ private slots:
     QAction* viewPublicBIP32Action;
     QAction* importBIP39Action;
     QAction* viewBIP39Action;
-    QAction* backupKeychainAction;
 
     // account actions
     QAction* quickNewAccountAction;