4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-13 11:56:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #383

Browse Source 
ba8decc wizard: Ensure temporary wallet files are deleted (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:58:39 -08:00
commit 6437723772
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oshelper.cpp
View File

@ -1,6 +1,8 @@
#include "oshelper.h" #include "oshelper.h"
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QDir> #include <QDir>
#include <QDebug>
#include <QString>
OSHelper::OSHelper(QObject *parent) : QObject(parent) OSHelper::OSHelper(QObject *parent) : QObject(parent)
{ {
@ -18,6 +20,16 @@ QString OSHelper::temporaryFilename() const
return tempFileName; return tempFileName;
} }
bool OSHelper::removeTemporaryWallet(const QString &fileName) const
{
// Temporary files should be deleted automatically by default, in case they wouldn't, we delete them manually as well
bool cache_deleted = QFile::remove(fileName);
bool address_deleted = QFile::remove(fileName + ".address.txt");
bool keys_deleted = QFile::remove(fileName +".keys");
return cache_deleted && address_deleted && keys_deleted;
}
QString OSHelper::temporaryPath() const QString OSHelper::temporaryPath() const
{ {
return QDir::tempPath(); return QDir::tempPath();

1
oshelper.h
View File

@ -13,6 +13,7 @@ public:
Q_INVOKABLE QString temporaryFilename() const; Q_INVOKABLE QString temporaryFilename() const;
Q_INVOKABLE QString temporaryPath() const; Q_INVOKABLE QString temporaryPath() const;
Q_INVOKABLE bool removeTemporaryWallet(const QString &walletName) const;
signals: signals:

8
wizard/WizardCreateWallet.qml
View File

@ -82,16 +82,16 @@ Item {
console.log("deleting wallet") console.log("deleting wallet")
} }
var wallet_filename = oshelper.temporaryFilename(); var tmp_wallet_filename = oshelper.temporaryFilename();
//var wallet = walletManager.createWallet(wallet_filename, "", settingsObject.language) console.log("Creating temporary wallet", tmp_wallet_filename)
var testnet = appWindow.persistentSettings.testnet; var testnet = appWindow.persistentSettings.testnet;
var wallet = walletManager.createWallet(wallet_filename, "", settingsObject.wallet_language, var wallet = walletManager.createWallet(tmp_wallet_filename, "", settingsObject.wallet_language,
testnet) testnet)
uiItem.wordsTextItem.memoText = wallet.seed uiItem.wordsTextItem.memoText = wallet.seed
// saving wallet in "global" settings object // saving wallet in "global" settings object
// TODO: wallet should have a property pointing to the file where it stored or loaded from // TODO: wallet should have a property pointing to the file where it stored or loaded from
settingsObject.wallet = wallet settingsObject.wallet = wallet
settingsObject.wallet_filename = wallet_filename settingsObject.tmp_wallet_filename = tmp_wallet_filename
} }
WizardManageWalletUI { WizardManageWalletUI {

17
wizard/WizardMain.qml
View File

@ -168,18 +168,14 @@ Rectangle {
//! actually writes the wallet //! actually writes the wallet
function applySettings() { function applySettings() {
console.log("Here we apply the settings"); // Save wallet files in user specified location
// here we need to actually move wallet to the new location
console.log(settings.wallet_full_path);
var new_wallet_filename = createWalletPath(settings.wallet_path,settings.account_name) var new_wallet_filename = createWalletPath(settings.wallet_path,settings.account_name)
console.log("saving in wizard: "+ new_wallet_filename) console.log("saving in wizard: "+ new_wallet_filename)
// moving wallet files to the new destination, if user changed it settings.wallet.store(new_wallet_filename);
if (new_wallet_filename !== settings.wallet_filename) {
// using previously saved wallet; // make sure temporary wallet files are deleted
settings.wallet.store(new_wallet_filename); console.log("Removing temporary wallet: "+ settings.tmp_wallet_filename)
} oshelper.removeTemporaryWallet(settings.tmp_wallet_filename)
// protecting wallet with password // protecting wallet with password
settings.wallet.setPassword(settings.wallet_password); settings.wallet.setPassword(settings.wallet_password);
@ -203,7 +199,6 @@ Rectangle {
appWindow.persistentSettings.restore_height = (isNaN(settings.restore_height))? 0 : settings.restore_height appWindow.persistentSettings.restore_height = (isNaN(settings.restore_height))? 0 : settings.restore_height
appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering
} }
// reading settings from persistent storage // reading settings from persistent storage

5
wizard/WizardRecoveryWallet.qml
View File

@ -73,11 +73,14 @@ Item {
function recoveryWallet(settingsObject) { function recoveryWallet(settingsObject) {
var testnet = appWindow.persistentSettings.testnet; var testnet = appWindow.persistentSettings.testnet;
var restoreHeight = settingsObject.restore_height; var restoreHeight = settingsObject.restore_height;
var wallet = walletManager.recoveryWallet(oshelper.temporaryFilename(), settingsObject.words, testnet, restoreHeight); var tmp_wallet_filename = oshelper.temporaryFilename()
console.log("Creating temporary wallet", tmp_wallet_filename)
var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, testnet, restoreHeight);
var success = wallet.status === Wallet.Status_Ok; var success = wallet.status === Wallet.Status_Ok;
if (success) { if (success) {
settingsObject['wallet'] = wallet; settingsObject['wallet'] = wallet;
settingsObject['is_recovering'] = true; settingsObject['is_recovering'] = true;
settingsObject['tmp_wallet_filename'] = tmp_wallet_filename
} else { } else {
walletManager.closeWallet(); walletManager.closeWallet();
} }