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

Merge branch 'dev' into refactoring/android

Browse source
This commit is contained in:
albexk 2023-12-20 20:47:19 +03:00
commit c8d2399db9
69 changed files with 5605 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,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);
emit importFinished();
@ -147,7 +149,9 @@ QJsonObject ImportController::extractAmneziaConfig(QString &data)
ba = ba_uncompressed;
}
return QJsonDocument::fromJson(ba).object();
QJsonObject config = QJsonDocument::fromJson(ba).object();
return config;
}
QJsonObject ImportController::extractOpenVpnConfig(const QString &data)