rework the update checker, menu item, and notifier (#4481)

Author: borgmanJeremy

src/core/flameshotdaemon.cpp

@@ -72,7 +72,7 @@ FlameshotDaemon::FlameshotDaemon()
   , m_trayIcon(nullptr)
 #if !defined(DISABLE_UPDATE_CHECKER)
   , m_appLatestVersion(QStringLiteral(APP_VERSION).replace("v", ""))
-  , m_showCheckAppUpdateStatus(false)
+  , m_showManualCheckAppUpdateStatus(false)
   , m_networkCheckUpdates(nullptr)
 #endif
 {
@@ -238,11 +238,27 @@ void FlameshotDaemon::getLatestAvailableVersion()
 
 void FlameshotDaemon::checkForUpdates()
 {
-    if (m_appLatestUrl.isEmpty()) {
-        m_showCheckAppUpdateStatus = true;
-        getLatestAvailableVersion();
+    bool autoCheckEnabled = ConfigHandler().checkForUpdates();
+
+    if (autoCheckEnabled) {
+        if (!m_appLatestUrl.isEmpty()) {
+            QDesktopServices::openUrl(QUrl(m_appLatestUrl));
+        }
     } else {
-        QDesktopServices::openUrl(QUrl(m_appLatestUrl));
+        m_showManualCheckAppUpdateStatus = true;
+
+        if (m_appLatestUrl.isEmpty()) {
+            getLatestAvailableVersion();
+        } else {
+            QVersionNumber appLatestVersion =
+              QVersionNumber::fromString(m_appLatestVersion);
+            if (Flameshot::instance()->getVersion() < appLatestVersion) {
+                QDesktopServices::openUrl(QUrl(m_appLatestUrl));
+            } else {
+                sendTrayNotification(tr("You have the latest version"),
+                                     "Flameshot");
+            }
+        }
     }
 }
 #endif
@@ -387,9 +403,11 @@ void FlameshotDaemon::enableTrayIcon(bool enable)
 #if !defined(DISABLE_UPDATE_CHECKER)
 void FlameshotDaemon::handleReplyCheckUpdates(QNetworkReply* reply)
 {
-    if (!ConfigHandler().checkForUpdates()) {
+    if (!ConfigHandler().checkForUpdates() &&
+        !m_showManualCheckAppUpdateStatus) {
         return;
     }
+
     if (reply->error() == QNetworkReply::NoError) {
         QJsonDocument response = QJsonDocument::fromJson(reply->readAll());
         QJsonObject json = response.object();
@@ -400,28 +418,25 @@ void FlameshotDaemon::handleReplyCheckUpdates(QNetworkReply* reply)
         if (Flameshot::instance()->getVersion() < appLatestVersion) {
             emit newVersionAvailable(appLatestVersion);
             m_appLatestUrl = json["html_url"].toString();
-            QString newVersion =
-              tr("New version %1 is available").arg(m_appLatestVersion);
-            if (m_showCheckAppUpdateStatus) {
-                sendTrayNotification(newVersion, "Flameshot");
+            if (m_showManualCheckAppUpdateStatus) {
                 QDesktopServices::openUrl(QUrl(m_appLatestUrl));
             }
-        } else if (m_showCheckAppUpdateStatus) {
+        } else if (m_showManualCheckAppUpdateStatus) {
             sendTrayNotification(tr("You have the latest version"),
                                  "Flameshot");
         }
     } else {
         qWarning() << "Failed to get information about the latest version. "
                    << reply->errorString();
-        if (m_showCheckAppUpdateStatus) {
+        if (m_showManualCheckAppUpdateStatus) {
             if (FlameshotDaemon::instance()) {
                 FlameshotDaemon::instance()->sendTrayNotification(
                   tr("Failed to get information about the latest version."),
                   "Flameshot");
             }
         }
     }
-    m_showCheckAppUpdateStatus = false;
+    m_showManualCheckAppUpdateStatus = false;
 }
 #endif
 

src/core/flameshotdaemon.h

@@ -87,7 +87,7 @@ private slots:
 #if !defined(DISABLE_UPDATE_CHECKER)
     QString m_appLatestUrl;
     QString m_appLatestVersion;
-    bool m_showCheckAppUpdateStatus;
+    bool m_showManualCheckAppUpdateStatus;
     QNetworkAccessManager* m_networkCheckUpdates;
 #endif
 

src/widgets/trayicon.cpp

@@ -135,9 +135,11 @@ void TrayIcon::initMenu()
             &QAction::triggered,
             Flameshot::instance(),
             &Flameshot::config);
-    auto* infoAction = new QAction(tr("&About"), this);
-    connect(
-      infoAction, &QAction::triggered, Flameshot::instance(), &Flameshot::info);
+    m_infoAction = new QAction(tr("&About"), this);
+    connect(m_infoAction,
+            &QAction::triggered,
+            Flameshot::instance(),
+            &Flameshot::info);
 
 #if !defined(DISABLE_UPDATE_CHECKER)
     m_appUpdates = new QAction(tr("Check for updates"), this);
@@ -150,10 +152,20 @@ void TrayIcon::initMenu()
             &FlameshotDaemon::newVersionAvailable,
             this,
             [this](const QVersionNumber& version) {
-                QString newVersion =
-                  tr("New version %1 is available").arg(version.toString());
-                m_appUpdates->setText(newVersion);
+                if (ConfigHandler().checkForUpdates()) {
+                    QString newVersion =
+                      tr("Download version %1").arg(version.toString());
+                    m_appUpdates->setText(newVersion);
+                    m_appUpdates->setVisible(true);
+
+                    // hack to work around menu not updating when the text /
+                    // visibility is modified Force menu refresh by removing and
+                    // re-adding the action
+                    m_menu->removeAction(m_appUpdates);
+                    m_menu->insertAction(m_infoAction, m_appUpdates);
+                }
             });
+    updateCheckUpdatesMenuVisibility();
 #endif
 
     QAction* quitAction = new QAction(tr("&Quit"), this);
@@ -186,7 +198,7 @@ void TrayIcon::initMenu()
 #if !defined(DISABLE_UPDATE_CHECKER)
     m_menu->addAction(m_appUpdates);
 #endif
-    m_menu->addAction(infoAction);
+    m_menu->addAction(m_infoAction);
     m_menu->addSeparator();
     m_menu->addAction(quitAction);
 }
@@ -204,14 +216,20 @@ void TrayIcon::updateCaptureActionShortcut()
 }
 
 #if !defined(DISABLE_UPDATE_CHECKER)
-void TrayIcon::enableCheckUpdatesAction(bool enable)
+void TrayIcon::updateCheckUpdatesMenuVisibility()
 {
-    if (m_appUpdates != nullptr) {
-        m_appUpdates->setVisible(enable);
-        m_appUpdates->setEnabled(enable);
+    if (m_appUpdates == nullptr) {
+        return;
     }
-    if (enable) {
-        FlameshotDaemon::instance()->getLatestAvailableVersion();
+
+    bool autoCheckEnabled = ConfigHandler().checkForUpdates();
+    if (autoCheckEnabled) {
+        // When auto-check is enabled, hide the menu item initially
+        // It will be shown when a new version is available via a callback
+        m_appUpdates->setVisible(false);
+    } else {
+        m_appUpdates->setVisible(true);
+        m_appUpdates->setText(tr("Check for updates"));
     }
 }
 #endif

src/widgets/trayicon.h

@@ -20,13 +20,14 @@ class TrayIcon : public QSystemTrayIcon
     void initMenu();
     void updateCaptureActionShortcut();
 #if !defined(DISABLE_UPDATE_CHECKER)
-    void enableCheckUpdatesAction(bool enable);
+    void updateCheckUpdatesMenuVisibility();
 #endif
 
     void startGuiCapture();
 
     QMenu* m_menu;
     QAction* m_captureAction;
+    QAction* m_infoAction;
 #if !defined(DISABLE_UPDATE_CHECKER)
     QAction* m_appUpdates;
 #endif

src/widgets/updatenotificationwidget.cpp

@@ -84,11 +84,16 @@ void UpdateNotificationWidget::ignoreButton()
 
 void UpdateNotificationWidget::updateButton()
 {
-    QDesktopServices::openUrl(m_appLatestUrl);
+    // Store URL before closing widgets
+    QString url = m_appLatestUrl;
+
     hide();
     if (parentWidget()) {
         parentWidget()->close();
     }
+
+    // Open URL after closing widgets
+    QDesktopServices::openUrl(QUrl(url));
 }
 
 void UpdateNotificationWidget::initInternalPanel()