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

added default container installation, after downloading the config from the api

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-12-11 13:42:42 +07:00
parent b4c89ad58f
commit e66fbc3289
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/amnezia_application.cpp
View file

@ -376,7 +376,4 @@ void AmneziaApplication::initControllers()
m_cloudController.reset(new ApiController(m_serversModel, m_containersModel)); m_cloudController.reset(new ApiController(m_serversModel, m_containersModel));
m_engine->rootContext()->setContextProperty("ApiController", m_cloudController.get()); m_engine->rootContext()->setContextProperty("ApiController", m_cloudController.get());
// connect(m_cloudController.get(), &ApiController::serverConfigUpdated, this,
// [this]() { m_containersModel->setCurrentlyProcessedServerIndex(m_serversModel->getDefaultServerIndex()); });
} }

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

@ -109,9 +109,11 @@ bool ApiController::updateServerConfigFromApi()
serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2)); serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2));
serverConfig.insert(config_key::containers, cloudConfig.value(config_key::containers)); serverConfig.insert(config_key::containers, cloudConfig.value(config_key::containers));
serverConfig.insert(config_key::hostName, cloudConfig.value(config_key::hostName)); serverConfig.insert(config_key::hostName, cloudConfig.value(config_key::hostName));
serverConfig.insert(config_key::defaultContainer, cloudConfig.value(config_key::defaultContainer));
auto defaultContainer = cloudConfig.value(config_key::defaultContainer).toString();
serverConfig.insert(config_key::defaultContainer, defaultContainer);
m_serversModel->editServer(serverConfig); m_serversModel->editServer(serverConfig);
emit serverConfigUpdated(); emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
} else { } else {
QString err = reply->errorString(); QString err = reply->errorString();
qDebug() << QString::fromUtf8(reply->readAll()); //todo remove debug output qDebug() << QString::fromUtf8(reply->readAll()); //todo remove debug output

1
client/ui/controllers/apiController.h
View file

@ -20,7 +20,6 @@ public slots:
signals: signals:
void errorOccurred(const QString &errorMessage); void errorOccurred(const QString &errorMessage);
void serverConfigUpdated();
private: private:
QString genPublicKey(const QString &protocol); QString genPublicKey(const QString &protocol);