Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KeysFiles: don't use WalletManager in findWallets #3006

Merged
merged 1 commit into from
Jul 14, 2020
Merged

KeysFiles: don't use WalletManager in findWallets #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
#endif

// Wallet .keys files model (wizard -> open wallet)
WalletKeysFilesModel walletKeysFilesModel(walletManager);
WalletKeysFilesModel walletKeysFilesModel;
engine.rootContext()->setContextProperty("walletKeysFilesModel", &walletKeysFilesModel);
engine.rootContext()->setContextProperty("walletKeysFilesModelProxy", &walletKeysFilesModel.proxyModel());

Expand Down
16 changes: 11 additions & 5 deletions src/qt/KeysFiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@ quint8 WalletKeysFiles::networkType() const
}


WalletKeysFilesModel::WalletKeysFilesModel(WalletManager *walletManager, QObject *parent)
WalletKeysFilesModel::WalletKeysFilesModel(QObject *parent)
: QAbstractListModel(parent)
{
this->m_walletManager = walletManager;
this->m_walletKeysFilesItemModel = qobject_cast<QAbstractItemModel *>(this);

this->m_walletKeysFilesModelProxy.setSourceModel(this->m_walletKeysFilesItemModel);
Expand Down Expand Up @@ -110,11 +109,18 @@ void WalletKeysFilesModel::refresh(const QString &moneroAccountsDir)

void WalletKeysFilesModel::findWallets(const QString &moneroAccountsDir)
{
QStringList walletDir = this->m_walletManager->findWallets(moneroAccountsDir);
foreach(QString wallet, walletDir){
if(!fileExists(wallet + ".keys"))
QDirIterator it(moneroAccountsDir, QDirIterator::Subdirectories);
for (; it.hasNext(); it.next())
{
QFileInfo keysFileinfo = it.fileInfo();

constexpr const char keysFileExtension[] = "keys";
if (!keysFileinfo.isFile() || keysFileinfo.completeSuffix() != keysFileExtension)
{
continue;
}

QString wallet(keysFileinfo.absolutePath() + QDir::separator() + keysFileinfo.baseName());
quint8 networkType = NetworkType::MAINNET;
QString address = QString("");

Expand Down
3 changes: 1 addition & 2 deletions src/qt/KeysFiles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class WalletKeysFilesModel : public QAbstractListModel
AddressRole
};

WalletKeysFilesModel(WalletManager *walletManager, QObject *parent = 0);
WalletKeysFilesModel(QObject *parent = 0);

Q_INVOKABLE void refresh(const QString &moneroAccountsDir);
Q_INVOKABLE void clear();
Expand All @@ -82,7 +82,6 @@ class WalletKeysFilesModel : public QAbstractListModel

private:
QList<WalletKeysFiles> m_walletKeyFiles;
WalletManager *m_walletManager;

QAbstractItemModel *m_walletKeysFilesItemModel;
QSortFilterProxyModel m_walletKeysFilesModelProxy;
Expand Down