added getting the config from the cloud service
This commit is contained in:
parent
5c121ea48d
commit
25f8283edd
27 changed files with 399 additions and 139 deletions
|
@ -141,7 +141,9 @@ void ImportController::importConfig()
|
|||
credentials.userName = m_config.value(config_key::userName).toString();
|
||||
credentials.secretData = m_config.value(config_key::password).toString();
|
||||
|
||||
if (credentials.isValid() || m_config.contains(config_key::containers)) {
|
||||
if (credentials.isValid()
|
||||
|| m_config.contains(config_key::containers)
|
||||
|| m_config.contains(config_key::configVersion)) { // todo
|
||||
m_serversModel->addServer(m_config);
|
||||
|
||||
m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
|
||||
|
@ -167,7 +169,11 @@ QJsonObject ImportController::extractAmneziaConfig(QString &data)
|
|||
ba = ba_uncompressed;
|
||||
}
|
||||
|
||||
return QJsonDocument::fromJson(ba).object();
|
||||
QJsonObject config = QJsonDocument::fromJson(ba).object();
|
||||
|
||||
qDebug() << config;
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue