added default container installation, after downloading the config from the api
This commit is contained in:
parent
b4c89ad58f
commit
e66fbc3289
3 changed files with 4 additions and 6 deletions
|
@ -376,7 +376,4 @@ void AmneziaApplication::initControllers()
|
|||
|
||||
m_cloudController.reset(new ApiController(m_serversModel, m_containersModel));
|
||||
m_engine->rootContext()->setContextProperty("ApiController", m_cloudController.get());
|
||||
|
||||
// connect(m_cloudController.get(), &ApiController::serverConfigUpdated, this,
|
||||
// [this]() { m_containersModel->setCurrentlyProcessedServerIndex(m_serversModel->getDefaultServerIndex()); });
|
||||
}
|
||||
|
|
|
@ -109,9 +109,11 @@ bool ApiController::updateServerConfigFromApi()
|
|||
serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2));
|
||||
serverConfig.insert(config_key::containers, cloudConfig.value(config_key::containers));
|
||||
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);
|
||||
emit serverConfigUpdated();
|
||||
emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
|
||||
} else {
|
||||
QString err = reply->errorString();
|
||||
qDebug() << QString::fromUtf8(reply->readAll()); //todo remove debug output
|
||||
|
|
|
@ -20,7 +20,6 @@ public slots:
|
|||
|
||||
signals:
|
||||
void errorOccurred(const QString &errorMessage);
|
||||
void serverConfigUpdated();
|
||||
|
||||
private:
|
||||
QString genPublicKey(const QString &protocol);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue