diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp index 22f7c95a3370f268386b3836bf858ba146e292cc..d6931aba9a4cd337d6b4ca2559675922d56f3704 100644 --- a/app/src/websockets/websocketserver.cpp +++ b/app/src/websockets/websocketserver.cpp @@ -211,25 +211,24 @@ void WebSocketServer::updateCheckAllFinished() sendMessage("", "ItemHandler::checkAllFinished", data); } -void WebSocketServer::updateUpdateStarted(QString path) +void WebSocketServer::updateUpdateStarted(QString fileKey) { QJsonArray data; - data.append(path); + data.append(fileKey); sendMessage("", "UpdateHandler::updateStarted", data); } -void WebSocketServer::updateUpdateFinished(QString path, QString newPath) +void WebSocketServer::updateUpdateFinished(QString fileKey) { QJsonArray data; - data.append(path); - data.append(newPath); + data.append(fileKey); sendMessage("", "UpdateHandler::updateFinished", data); } -void WebSocketServer::updateUpdateProgress(QString path, int progress) +void WebSocketServer::updateUpdateProgress(QString fileKey, int progress) { QJsonArray data; - data.append(path); + data.append(fileKey); data.append(progress); sendMessage("", "UpdateHandler::updateProgress", data); } @@ -358,10 +357,10 @@ void WebSocketServer::receiveMessage(const QString &id, const QString &func, con } // UpdateHandler else if (func == "UpdateHandler::checkAll") { - resultData.append(updateHandler_->checkAll()); + updateHandler_->checkAll(); } else if (func == "UpdateHandler::update") { - resultData.append(updateHandler_->update(data.at(0).toString())); + updateHandler_->update(data.at(0).toString()); } // DesktopThemeHandler else if (func == "DesktopThemeHandler::desktopEnvironment") { diff --git a/app/src/websockets/websocketserver.h b/app/src/websockets/websocketserver.h index 51ccffe17e2a8c3d818f754ed2fa0fb9d9649c4e..e4b9ba63ba038b137640d66f6323ab54db1ae49e 100644 --- a/app/src/websockets/websocketserver.h +++ b/app/src/websockets/websocketserver.h @@ -53,9 +53,9 @@ private slots: void updateCheckAllStarted(); void updateCheckAllFinished(); - void updateUpdateStarted(QString path); - void updateUpdateFinished(QString path, QString newPath); - void updateUpdateProgress(QString path, int progress); + void updateUpdateStarted(QString fileKey); + void updateUpdateFinished(QString fileKey); + void updateUpdateProgress(QString fileKey, int progress); private: void receiveMessage(const QString &id, const QString &func, const QJsonArray &data);