github-personal/amnezia-client
1
0
Fork 0
mirror of https://github.com/outbackdingo/amnezia-client.git synced 2026-01-27 10:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into refactoring/android

Browse Source
This commit is contained in:
albexk
2023-12-20 20:47:19 +03:00
parent 6d0167dcf3 9f5025c10b
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)