|
|
@ -388,11 +388,14 @@ void MainWindow::closeEvent(QCloseEvent* event) { |
|
|
|
s.sync(); |
|
|
|
|
|
|
|
// Let the RPC know to shut down any running service.
|
|
|
|
if(rpc){ |
|
|
|
rpc->shutdownhushd(); |
|
|
|
int passphraselenght = DataStore::getChatDataStore()->getPassword().length(); |
|
|
|
} |
|
|
|
|
|
|
|
int passphraselength = DataStore::getChatDataStore()->getPassword().length(); |
|
|
|
|
|
|
|
// Check is encryption is ON for SDl
|
|
|
|
if(passphraselenght > 0) { |
|
|
|
if(passphraselength > 0) { |
|
|
|
// delete old file before
|
|
|
|
|
|
|
|
//auto dirHome = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
|
|
|
@ -635,6 +638,10 @@ void MainWindow::removeWalletEncryptionStartUp() { |
|
|
|
Ui_startup ed; |
|
|
|
ed.setupUi(&d); |
|
|
|
|
|
|
|
// Connect cancel button to close app on queued connection
|
|
|
|
QObject::connect(ed.buttonBox, &QDialogButtonBox::rejected, qApp, &QCoreApplication::quit, Qt::QueuedConnection); |
|
|
|
|
|
|
|
// Connect new/restore button click
|
|
|
|
QObject::connect(ed.new_restore, &QPushButton::clicked, [&] { |
|
|
|
|
|
|
|
d.close(); |
|
|
@ -648,8 +655,7 @@ void MainWindow::removeWalletEncryptionStartUp() { |
|
|
|
cl->loadConnection(); |
|
|
|
}); |
|
|
|
|
|
|
|
if (d.exec() == QDialog::Accepted) |
|
|
|
{ |
|
|
|
if (d.exec() == QDialog::Accepted){ |
|
|
|
QString passphraseBlank = ed.txtPassword->text(); // data comes from user inputs
|
|
|
|
|
|
|
|
QString passphrase = QString("HUSH3") + passphraseBlank + QString("SDL"); |
|
|
@ -708,7 +714,6 @@ void MainWindow::removeWalletEncryptionStartUp() { |
|
|
|
}else{ |
|
|
|
this->doClosePw(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
QString MainWindow::getPassword() |
|
|
|