Fix Xray status update mechanism

censortracker · Feb 26, 2025 · 554761a · 554761a
1 parent 7f28f2e
commit 554761a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/proxyserver/src/proxyserver.cpp b/proxyserver/src/proxyserver.cpp
@@ -15,6 +15,7 @@ ProxyServer::ProxyServer(QObject *parent)
     connect(&m_trayIcon, &TrayIcon::quitRequested, this, &ProxyServer::quit);
     connect(&m_trayIcon, &TrayIcon::configSelected, this, &ProxyServer::onConfigSelected);
     connect(m_service.data(), &ProxyService::configsChanged, this, &ProxyServer::updateTrayConfigsMenu);
+    connect(m_service.data(), &ProxyService::xrayStatusChanged, &m_trayIcon, &TrayIcon::updateStatus);
 }
 
 ProxyServer::~ProxyServer()
@@ -55,16 +56,12 @@ void ProxyServer::stop()
 bool ProxyServer::startXrayProcess()
 {
     bool success = m_service->startXray();
-    if (success) {
-        m_trayIcon.updateStatus(true);
-    }
     return success;
 }
 
 void ProxyServer::stopXrayProcess()
 {
     m_service->stopXray();
-    m_trayIcon.updateStatus(false);
 }
 
 void ProxyServer::quit()

diff --git a/proxyserver/src/proxyservice.cpp b/proxyserver/src/proxyservice.cpp
@@ -34,6 +34,7 @@ bool ProxyService::startXray()
     bool success = m_xrayController->start(m_configManager->getActiveConfigPath());
     if (success) {
         Logger::getInstance().info("Xray started successfully");
+        emit xrayStatusChanged(true);
     } else {
         Logger::getInstance().error("Failed to start Xray");
     }
@@ -45,6 +46,7 @@ bool ProxyService::stopXray()
     Logger::getInstance().info("Stopping Xray");
     m_xrayController->stop();
     Logger::getInstance().info("Xray stopped");
+    emit xrayStatusChanged(false);
     return true;
 }
 

diff --git a/proxyserver/src/proxyservice.h b/proxyserver/src/proxyservice.h
@@ -34,6 +34,7 @@ class ProxyService : public QObject, public IProxyService {
 
 signals:
     void configsChanged();
+    void xrayStatusChanged(bool running);
 
 private:
     QScopedPointer<ConfigManager> m_configManager;

diff --git a/proxyserver/src/trayicon.h b/proxyserver/src/trayicon.h
@@ -16,11 +16,13 @@ class TrayIcon : public QObject
     explicit TrayIcon(QObject *parent = nullptr);
     ~TrayIcon() = default;
 
-    void updateStatus(bool isActive);
     void updateConfigsMenu(const QMap<QString, QJsonObject>& configs, const QString& activeConfigUuid);
     void updatePorts(quint16 proxyPort, quint16 httpPort);
     void updateError(const QString &errorMessage);
 
+public slots:
+    void updateStatus(bool isActive);
+
 signals:
     void quitRequested();
     void configSelected(const QString& uuid);