diff options
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardController.qml | 53 | ||||
| -rw-r--r-- | wizard/WizardCreateWallet4.qml | 7 | ||||
| -rw-r--r-- | wizard/WizardRestoreWallet4.qml | 5 |
3 files changed, 37 insertions, 28 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index 3ec9dc79..a1628b4f 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -344,41 +344,48 @@ Rectangle { wizardController.tmpWalletFilename = tmp_wallet_filename } - function writeWallet() { + function writeWallet(onSuccess) { // Save wallet files in user specified location var new_wallet_filename = Wizard.createWalletPath( isIOS, wizardController.walletOptionsLocation, wizardController.walletOptionsName); - if(isIOS) { - console.log("saving in ios: " + moneroAccountsDir + new_wallet_filename) - wizardController.m_wallet.store(moneroAccountsDir + new_wallet_filename); - } else { - console.log("saving in wizard: " + new_wallet_filename) - wizardController.m_wallet.store(new_wallet_filename); - } + const handler = function(success) { + if (!success) { + appWindow.showStatusMessage(qsTr("Failed to store the wallet"), 3); + return; + } - // make sure temporary wallet files are deleted - console.log("Removing temporary wallet: " + wizardController.tmpWalletFilename) - oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename) + // make sure temporary wallet files are deleted + console.log("Removing temporary wallet: " + wizardController.tmpWalletFilename) + oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename) - // protecting wallet with password - wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); + // protecting wallet with password + wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); - // save to persistent settings - persistentSettings.language = wizardController.language_language - persistentSettings.locale = wizardController.language_locale + // save to persistent settings + persistentSettings.language = wizardController.language_language + persistentSettings.locale = wizardController.language_locale - persistentSettings.account_name = wizardController.walletOptionsName - persistentSettings.wallet_path = wizardController.m_wallet.path; - persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight + persistentSettings.account_name = wizardController.walletOptionsName + persistentSettings.wallet_path = wizardController.m_wallet.path; + persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight - persistentSettings.allow_background_mining = false - persistentSettings.is_recovering = (wizardController.walletOptionsIsRecovering === undefined) ? false : wizardController.walletOptionsIsRecovering - persistentSettings.is_recovering_from_device = (wizardController.walletOptionsIsRecoveringFromDevice === undefined) ? false : wizardController.walletOptionsIsRecoveringFromDevice + persistentSettings.allow_background_mining = false + persistentSettings.is_recovering = (wizardController.walletOptionsIsRecovering === undefined) ? false : wizardController.walletOptionsIsRecovering + persistentSettings.is_recovering_from_device = (wizardController.walletOptionsIsRecoveringFromDevice === undefined) ? false : wizardController.walletOptionsIsRecoveringFromDevice - restart(); + restart(); + + onSuccess(); + }; + + if (isIOS) { + new_wallet_filename = moneroAccountsDir + new_wallet_filename; + } + console.log("saving new wallet to", new_wallet_filename); + wizardController.m_wallet.storeAsync(handler, new_wallet_filename); } function recoveryWallet() { diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml index f28a0f4a..2fa410fe 100644 --- a/wizard/WizardCreateWallet4.qml +++ b/wizard/WizardCreateWallet4.qml @@ -77,9 +77,10 @@ Rectangle { } } onNextClicked: { - wizardController.writeWallet(); - wizardController.useMoneroClicked(); - wizardController.walletOptionsIsRecoveringFromDevice = false; + wizardController.writeWallet(function() { + wizardController.useMoneroClicked(); + wizardController.walletOptionsIsRecoveringFromDevice = false; + }); } } } diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml index ac552b37..f4a0456c 100644 --- a/wizard/WizardRestoreWallet4.qml +++ b/wizard/WizardRestoreWallet4.qml @@ -78,8 +78,9 @@ Rectangle { } onNextClicked: { wizardController.recoveryWallet(); - wizardController.writeWallet(); - wizardController.useMoneroClicked(); + wizardController.writeWallet(function() { + wizardController.useMoneroClicked(); + }); } } } |