From 9b98e0a2f5b28279fa4cbe37be44f4866360a17d Mon Sep 17 00:00:00 2001 From: xiphon Date: Thu, 23 Apr 2020 14:19:20 +0000 Subject: checkUpates: installer support (Win), use GUI buildTag and version --- src/libwalletqt/WalletManager.cpp | 16 ++++++++++++---- src/libwalletqt/WalletManager.h | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/libwalletqt') diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index ed4f5776..a5c9e0ff 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -463,10 +463,18 @@ bool WalletManager::saveQrCode(const QString &code, const QString &path) const return QRCodeImageProvider::genQrImage(code, &size).scaled(size.expandedTo(QSize(240, 240)), Qt::KeepAspectRatio).save(path, "PNG", 100); } -void WalletManager::checkUpdatesAsync(const QString &software, const QString &subdir) -{ - m_scheduler.run([this, software, subdir] { - const auto updateInfo = Monero::WalletManager::checkUpdates(software.toStdString(), subdir.toStdString()); +void WalletManager::checkUpdatesAsync( + const QString &software, + const QString &subdir, + const QString &buildTag, + const QString &version) +{ + m_scheduler.run([this, software, subdir, buildTag, version] { + const auto updateInfo = Monero::WalletManager::checkUpdates( + software.toStdString(), + subdir.toStdString(), + buildTag.toStdString().c_str(), + version.toStdString().c_str()); if (!std::get<0>(updateInfo)) { return; diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 6470152d..01767716 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -175,7 +175,11 @@ public: Q_INVOKABLE bool parse_uri(const QString &uri, QString &address, QString &payment_id, uint64_t &amount, QString &tx_description, QString &recipient_name, QVector &unknown_parameters, QString &error) const; Q_INVOKABLE QVariantMap parse_uri_to_object(const QString &uri) const; Q_INVOKABLE bool saveQrCode(const QString &, const QString &) const; - Q_INVOKABLE void checkUpdatesAsync(const QString &software, const QString &subdir); + Q_INVOKABLE void checkUpdatesAsync( + const QString &software, + const QString &subdir, + const QString &buildTag, + const QString &version); Q_INVOKABLE QString checkUpdates(const QString &software, const QString &subdir) const; // clear/rename wallet cache -- cgit v1.2.3