AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto reconection when current-server's defaul container hase been changed

Browse source
This commit is contained in:
ronoaer 2023-09-13 20:49:44 +08:00
parent f11c65c393
commit bfc8c10f3d
10 changed files with 74 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/ui/controllers/connectionController.cpp
View file

@ -118,6 +118,14 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
emit connectionStateChanged();
}
void ConnectionController::onCurrentContainerChanged()
{
if(m_isConnected || m_isConnectionInProgress) {
emit reconnectWithChangedContainer(tr("Settings updated successfully, Reconnnection..."));
openConnection();
}
}
QString ConnectionController::connectionStateText() const
{
return m_connectionStateText;

3
client/ui/controllers/connectionController.h
View file

@ -32,6 +32,8 @@ public slots:
QString getLastConnectionError();
void onConnectionStateChanged(Vpn::ConnectionState state);
void onCurrentContainerChanged();
signals:
void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
const QJsonObject &containerConfig);
@ -39,6 +41,7 @@ signals:
void connectionStateChanged();
void connectionErrorOccurred(const QString &errorMessage);
void reconnectWithChangedContainer(const QString &message);
private:
QSharedPointer<ServersModel> m_serversModel;

18
client/ui/controllers/installController.cpp
View file

@ -254,12 +254,26 @@ void InstallController::updateContainer(QJsonObject config)
ServerController serverController(m_settings);
connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
bool reinstallRequired = serverController.isReinstallContainerRequired(container, oldContainerConfig, config);
auto errorCode = serverController.updateContainer(reinstallRequired, serverCredentials, container, oldContainerConfig, config);
if (errorCode == ErrorCode::NoError) {
m_containersModel->setData(modelIndex, config, ContainersModel::Roles::ConfigRole);
m_protocolModel->updateModel(config);
emit updateContainerFinished();
bool isCurrentContainerChanged = false;
if (reinstallRequired &&
(serverIndex == m_serversModel->getDefaultServerIndex()) &&
(container == m_containersModel->getDefaultContainer()) ) {
isCurrentContainerChanged = true;
}
if (isCurrentContainerChanged) {
emit currentContainerChanged();
} else {
emit updateContainerFinished(tr("Settings updated successfully"));
}
return;
}

4
client/ui/controllers/installController.h
View file

@ -49,7 +49,7 @@ signals:
void installContainerFinished(const QString &finishMessage, bool isServiceInstall);
void installServerFinished(const QString &finishMessage);
void updateContainerFinished();
void updateContainerFinished(const QString& message);
void scanServerFinished(bool isInstalledContainerFound);
@ -66,6 +66,8 @@ signals:
void serverIsBusy(const bool isBusy);
void currentContainerChanged();
private:
void installServer(DockerContainer container, QJsonObject &config);
void installContainer(DockerContainer container, QJsonObject &config);