updater: no-tor-bundle releases platform tag

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 2b6385113372b2e966838368796783c1a17aca86..457fb5380ac9d66a669e9e8ba1785f9f35832380 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -49,7 +49,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
 {
     ui->setupUi(this);
 
-    qDebug() << "Platform tag: " << this->getPlatformTag();
 //    MCWARNING("feather", "Platform tag: " << this->getPlatformTag().toStdString());
 
     // Ensure the destructor is called after closeEvent()
@@ -1542,37 +1541,6 @@ void MainWindow::onReportBug(bool checked) {
     Utils::externalLinkWarning(this, "https://docs.featherwallet.org/guides/report-an-issue");
 }
 
-QString MainWindow::getPlatformTag() {
-#ifdef Q_OS_MACOS
-    return "mac";
-#endif
-#ifdef Q_OS_WIN
-#ifdef PLATFORM_INSTALLER
-    return "win-installer";
-#endif
-    return "win";
-#endif
-#ifdef Q_OS_LINUX
-    QString tag = "";
-
-    QString arch = QSysInfo::buildCpuArchitecture();
-    if (arch == "arm64") {
-        tag += "linux-arm64";
-    } else if (arch == "arm") {
-        tag += "linux-arm";
-    } else {
-        tag += "linux";
-    }
-
-    if (!qEnvironmentVariableIsEmpty("APPIMAGE")) {
-        tag += "-appimage";
-    }
-
-    return tag;
-#endif
-    return "";
-}
-
 QString MainWindow::getHardwareDevice() {
     if (!m_wallet->isHwBacked())
         return "";

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 4b27075f92d38ef192f4990da9b8e485bb492175..be84f59c9aae6e810e451c527650f5ba0512aa70 100644 (file)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -215,7 +215,6 @@ private:
     void setStatusText(const QString &text, bool override = false, int timeout = 1000);
     void showBalanceDialog();
     QString statusDots();
-    QString getPlatformTag();
     void displayWalletErrorMsg(const QString &err);
     QString getHardwareDevice();
     void updateTitle();

diff --git a/src/utils/Updater.cpp b/src/utils/Updater.cpp
index d76325c2b1d8561e8cbbce6d9c94bc0fd6156372..4cfa07c0e6a2057e309039fb0aaf27fd7add4a14 100644 (file)
--- a/src/utils/Updater.cpp
+++ b/src/utils/Updater.cpp
@@ -20,6 +20,8 @@ Updater::Updater(QObject *parent) :
 {
     std::string featherWallet = Utils::fileOpen(":/assets/gpg_keys/featherwallet.asc").toStdString();
     m_maintainers.emplace_back(featherWallet);
+
+    qDebug() << "Platform tag: " << this->getPlatformTag();
 }
 
 void Updater::checkForUpdates() {
@@ -155,6 +157,10 @@ QString Updater::getPlatformTag() {
         tag += "-appimage";
     }
 
+#if !defined(HAS_TOR_BIN)
+    tag += "-a";
+#endif
+
     return tag;
 #endif
     return "";