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

added reconnection to vpn after changing any protocol settings

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-09-17 17:03:39 +05:00
parent bfc8c10f3d
commit c0cb5b96bf
11 changed files with 33 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/amnezia_application.cpp
View file

@ -336,8 +336,8 @@ void AmneziaApplication::initControllers()
&PageController::showPassphraseRequestDrawer);
connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
&InstallController::setEncryptedPassphrase);
connect(m_installController.get(), &InstallController::currentContainerChanged, m_connectionController.get(),
&ConnectionController::onCurrentContainerChanged);
connect(m_installController.get(), &InstallController::currentContainerUpdated, m_connectionController.get(),
&ConnectionController::onCurrentContainerUpdated);
m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());

8
client/core/servercontroller.cpp
View file

@ -290,11 +290,13 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
return startupContainerWorker(credentials, container, config);
}
ErrorCode ServerController::updateContainer(const bool reinstallRequired,
const ServerCredentials &credentials,
DockerContainer container,
ErrorCode ServerController::updateContainer(const ServerCredentials &credentials, DockerContainer container,
const QJsonObject &oldConfig, QJsonObject &newConfig)
{
bool reinstallRequired = isReinstallContainerRequired(container, oldConfig, newConfig);
qDebug() << "ServerController::updateContainer for container" << container << "reinstall required is"
<< reinstallRequired;
if (reinstallRequired) {
return setupContainer(credentials, container, newConfig, true);
} else {

11
client/core/servercontroller.h
View file

@ -26,10 +26,8 @@ public:
ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);
ErrorCode setupContainer(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config,
bool isUpdate = false);
ErrorCode updateContainer(const bool reinstallRequired, const ServerCredentials &credentials,
DockerContainer container,
const QJsonObject &oldConfig,
QJsonObject &newConfig);
ErrorCode updateContainer(const ServerCredentials &credentials, DockerContainer container,
const QJsonObject &oldConfig, QJsonObject &newConfig);
ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials,
QMap<DockerContainer, QJsonObject> &installedContainers);
@ -63,8 +61,6 @@ public:
ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey,
const std::function<QString()> &callback);
bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
const QJsonObject &newConfig);
private:
ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container,
@ -77,7 +73,8 @@ private:
ErrorCode isServerPortBusy(const ServerCredentials &credentials, DockerContainer container,
const QJsonObject &config);
bool isReinstallContainerRequired(DockerContainer container, const QJsonObject &oldConfig,
const QJsonObject &newConfig);
ErrorCode isUserInSudo(const ServerCredentials &credentials, DockerContainer container);
ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);

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

@ -118,10 +118,10 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
emit connectionStateChanged();
}
void ConnectionController::onCurrentContainerChanged()
void ConnectionController::onCurrentContainerUpdated()
{
if(m_isConnected || m_isConnectionInProgress) {
emit reconnectWithChangedContainer(tr("Settings updated successfully, Reconnnection..."));
if (m_isConnected || m_isConnectionInProgress) {
emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection..."));
openConnection();
}
}

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

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

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

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

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

@ -66,7 +66,7 @@ signals:
void serverIsBusy(const bool isBusy);
void currentContainerChanged();
void currentContainerUpdated();
private:
void installServer(DockerContainer container, QJsonObject &config);

16
client/ui/qml/Pages2/PageProtocolCloakSettings.qml
View file

@ -13,22 +13,6 @@ import "../Components"
PageType {
id: root
Connections {
target: ConnectionController
function onReconnectWithChangedContainer(message) {
PageController.showNotificationMessage(message)
}
}
Connections {
target: InstallController
function onUpdateContainerFinished(message) {
PageController.showNotificationMessage(message)
}
}
ColumnLayout {
id: backButton

16
client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
View file

@ -15,22 +15,6 @@ import "../Components"
PageType {
id: root
Connections {
target: ConnectionController
function onReconnectWithChangedContainer(message) {
PageController.showNotificationMessage(message)
}
}
Connections {
target: InstallController
function onUpdateContainerFinished(message) {
PageController.showNotificationMessage(message)
}
}
ColumnLayout {
id: backButton

17
client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
View file

@ -13,23 +13,6 @@ import "../Components"
PageType {
id: root
Connections {
target: ConnectionController
function onReconnectWithChangedContainer(message) {
PageController.showNotificationMessage(message)
}
}
Connections {
target: InstallController
function onUpdateContainerFinished(message) {
PageController.showNotificationMessage(message)
}
}
ColumnLayout {
id: backButton

12
client/ui/qml/Pages2/PageStart.qml
View file

@ -82,6 +82,18 @@ PageType {
PageController.closePage()
}
}
function onUpdateContainerFinished(message) {
PageController.showNotificationMessage(message)
}
}
Connections {
target: ConnectionController
function onReconnectWithUpdatedContainer(message) {
PageController.showNotificationMessage(message)
}
}
StackViewType {