github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-28 09:31:37 +01:00
Code Releases Activity

open-wallet: set network type when using file browser

Browse Source 
Co-authored-by: selsta <selsta@users.noreply.github.com>
This commit is contained in:
plowsof 2022-12-23 08:30:03 +00:00
parent 48393db2c7
commit a01dc06a54
4 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/oshelper.cpp
View File

@ -63,6 +63,7 @@
#include "QR-Code-scanner/Decoder.h"
#include "qt/ScopeGuard.h"
#include "NetworkType.h"
namespace
{
@ -280,3 +281,35 @@ bool OSHelper::installed() const
return false;
#endif
}
std::pair<quint8, QString> OSHelper::getNetworkTypeAndAddressFromFile(const QString &wallet)
{
quint8 networkType = NetworkType::MAINNET;
QString address = QString("");
// attempt to retreive wallet address
if(QFile::exists(wallet + ".address.txt")){
QFile file(wallet + ".address.txt");
file.open(QFile::ReadOnly | QFile::Text);
QString _address = QString(file.readAll());
if(!_address.isEmpty()){
address = _address;
if(address.startsWith("5") || address.startsWith("7")){
networkType = NetworkType::STAGENET;
} else if(address.startsWith("9") || address.startsWith("B")){
networkType = NetworkType::TESTNET;
}
}
file.close();
}
return std::make_pair(networkType, address);
}
quint8 OSHelper::getNetworkTypeFromFile(const QString &keysPath) const
{
QString walletPath = keysPath;
if(keysPath.endsWith(".keys")){
walletPath = keysPath.mid(0,keysPath.length()-5);
}
return getNetworkTypeAndAddressFromFile(walletPath).first;
}

2
src/main/oshelper.h
View File

@ -52,7 +52,9 @@ public:
Q_INVOKABLE QString temporaryPath() const;
Q_INVOKABLE bool removeTemporaryWallet(const QString &walletName) const;
Q_INVOKABLE bool isCapsLock() const;
Q_INVOKABLE quint8 getNetworkTypeFromFile(const QString &keysPath) const;
static std::pair<quint8, QString> getNetworkTypeAndAddressFromFile(const QString &wallet);
private:
bool installed() const;

24
src/qt/KeysFiles.cpp
View File

@ -39,6 +39,7 @@
#include "libwalletqt/WalletManager.h"
#include "NetworkType.h"
#include "qt/utils.h"
#include "main/oshelper.h"
#include "KeysFiles.h"
@ -121,26 +122,9 @@ void WalletKeysFilesModel::findWallets(const QString &moneroAccountsDir)
}
QString wallet(keysFileinfo.path() + QDir::separator() + keysFileinfo.completeBaseName());
quint8 networkType = NetworkType::MAINNET;
QString address = QString("");
// attempt to retreive wallet address
if(fileExists(wallet + ".address.txt")){
QFile file(wallet + ".address.txt");
file.open(QFile::ReadOnly | QFile::Text);
QString _address = QString(file.readAll());
if(!_address.isEmpty()){
address = _address;
if(address.startsWith("5") || address.startsWith("7")){
networkType = NetworkType::STAGENET;
} else if(address.startsWith("9") || address.startsWith("B")){
networkType = NetworkType::TESTNET;
}
}
file.close();
}
auto networkTypeAndAddress = OSHelper::getNetworkTypeAndAddressFromFile(wallet);
quint8 networkType = networkTypeAndAddress.first;
QString address = networkTypeAndAddress.second;
this->addWalletKeysFile(WalletKeysFiles(wallet, networkType, std::move(address)));
}

4
wizard/WizardController.qml
View File

@ -308,7 +308,9 @@ Rectangle {
sidebarVisible: false
onAccepted: {
wizardController.openWalletFile(fileDialog.fileUrl);
var keysPath = walletManager.urlToLocalPath(fileDialog.fileUrl)
persistentSettings.nettype = oshelper.getNetworkTypeFromFile(keysPath);
wizardController.openWalletFile(keysPath);
}
onRejected: {
console.log("Canceled")