mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
refactor: refactor the application to the mvvm architecture (#2009)
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
This commit is contained in:
vkamn
203
client/ui/controllers/importUiController.cpp
Normal file
203
client/ui/controllers/importUiController.cpp
Normal file
@@ -0,0 +1,203 @@
|
||||
#include "importUiController.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QMutex>
|
||||
#include <QJsonDocument>
|
||||
|
||||
#include "systemController.h"
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
#include "platforms/android/android_controller.h"
|
||||
#endif
|
||||
|
||||
#if defined Q_OS_ANDROID
|
||||
ImportUiController* ImportUiController::mInstance = nullptr;
|
||||
static QMutex qrDecodeMutex;
|
||||
#endif
|
||||
|
||||
ImportUiController::ImportUiController(ImportController* importController, QObject *parent)
|
||||
: QObject(parent),
|
||||
m_importController(importController),
|
||||
m_isNativeWireGuardConfig(false)
|
||||
{
|
||||
#if defined Q_OS_ANDROID
|
||||
mInstance = this;
|
||||
#endif
|
||||
|
||||
connect(m_importController, &ImportController::importFinished, this, &ImportUiController::importFinished);
|
||||
connect(m_importController, &ImportController::importErrorOccurred, this, &ImportUiController::importErrorOccurred);
|
||||
connect(m_importController, &ImportController::restoreAppConfig, this, &ImportUiController::restoreAppConfig);
|
||||
}
|
||||
|
||||
bool ImportUiController::extractConfigFromFile(const QString &fileName)
|
||||
{
|
||||
QString data;
|
||||
if (!SystemController::readFile(fileName, data)) {
|
||||
emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
QString configFileName = QFileInfo(QFile(fileName).fileName()).fileName();
|
||||
#ifdef Q_OS_ANDROID
|
||||
if (configFileName.isEmpty()) {
|
||||
configFileName = AndroidController::instance()->getFileName(fileName);
|
||||
}
|
||||
#endif
|
||||
|
||||
auto result = m_importController->extractConfigFromData(data, configFileName);
|
||||
|
||||
if (result.errorCode != ErrorCode::NoError) {
|
||||
emit importErrorOccurred(result.errorCode, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
m_config = result.config;
|
||||
m_configFileName = result.configFileName;
|
||||
m_maliciousWarningText = result.maliciousWarningText;
|
||||
m_isNativeWireGuardConfig = result.isNativeWireGuardConfig;
|
||||
|
||||
emit importConfigChanged();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ImportUiController::extractConfigFromData(QString data)
|
||||
{
|
||||
auto result = m_importController->extractConfigFromData(data);
|
||||
|
||||
if (result.errorCode != ErrorCode::NoError) {
|
||||
emit importErrorOccurred(result.errorCode, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
m_config = result.config;
|
||||
m_configFileName = result.configFileName;
|
||||
m_maliciousWarningText = result.maliciousWarningText;
|
||||
m_isNativeWireGuardConfig = result.isNativeWireGuardConfig;
|
||||
|
||||
emit importConfigChanged();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ImportUiController::extractConfigFromQr(const QByteArray &data)
|
||||
{
|
||||
auto result = m_importController->extractConfigFromQr(data);
|
||||
|
||||
if (result.errorCode != ErrorCode::NoError) {
|
||||
emit importErrorOccurred(result.errorCode, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
m_config = result.config;
|
||||
m_configFileName = result.configFileName;
|
||||
m_maliciousWarningText = result.maliciousWarningText;
|
||||
m_isNativeWireGuardConfig = result.isNativeWireGuardConfig;
|
||||
|
||||
emit importConfigChanged();
|
||||
return true;
|
||||
}
|
||||
|
||||
QString ImportUiController::getConfig()
|
||||
{
|
||||
return QJsonDocument(m_config).toJson(QJsonDocument::Indented);
|
||||
}
|
||||
|
||||
QString ImportUiController::getConfigFileName()
|
||||
{
|
||||
return m_configFileName;
|
||||
}
|
||||
|
||||
QString ImportUiController::getMaliciousWarningText()
|
||||
{
|
||||
return m_maliciousWarningText;
|
||||
}
|
||||
|
||||
bool ImportUiController::isNativeWireGuardConfig()
|
||||
{
|
||||
return m_isNativeWireGuardConfig;
|
||||
}
|
||||
|
||||
void ImportUiController::processNativeWireGuardConfig()
|
||||
{
|
||||
m_config = m_importController->processNativeWireGuardConfig(m_config);
|
||||
emit importConfigChanged();
|
||||
}
|
||||
|
||||
void ImportUiController::importConfig()
|
||||
{
|
||||
m_importController->importConfig(m_config);
|
||||
|
||||
m_config = {};
|
||||
m_configFileName.clear();
|
||||
m_maliciousWarningText.clear();
|
||||
m_isNativeWireGuardConfig = false;
|
||||
|
||||
emit importConfigChanged();
|
||||
}
|
||||
|
||||
void ImportUiController::clearConfigFileName()
|
||||
{
|
||||
m_configFileName.clear();
|
||||
emit importConfigChanged();
|
||||
}
|
||||
|
||||
#if defined Q_OS_ANDROID || defined Q_OS_IOS
|
||||
void ImportUiController::startDecodingQr()
|
||||
{
|
||||
m_importController->startDecodingQr();
|
||||
#if defined Q_OS_ANDROID
|
||||
AndroidController::instance()->startQrReaderActivity();
|
||||
#endif
|
||||
}
|
||||
|
||||
void ImportUiController::stopDecodingQr()
|
||||
{
|
||||
emit qrDecodingFinished();
|
||||
}
|
||||
|
||||
bool ImportUiController::parseQrCodeChunk(const QString &code)
|
||||
{
|
||||
auto parseResult = m_importController->parseQrCodeChunk(code);
|
||||
if (parseResult.success) {
|
||||
m_config = parseResult.importResult.config;
|
||||
m_configFileName = parseResult.importResult.configFileName;
|
||||
m_maliciousWarningText = parseResult.importResult.maliciousWarningText;
|
||||
m_isNativeWireGuardConfig = parseResult.importResult.isNativeWireGuardConfig;
|
||||
emit importConfigChanged();
|
||||
stopDecodingQr();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
double ImportUiController::getQrCodeScanProgressBarValue()
|
||||
{
|
||||
const int total = m_importController->qrChunksTotal();
|
||||
if (total == 0) {
|
||||
return 0.0;
|
||||
}
|
||||
return (1.0 / total) * m_importController->qrChunksReceived();
|
||||
}
|
||||
|
||||
QString ImportUiController::getQrCodeScanProgressString()
|
||||
{
|
||||
return tr("Scanned %1 of %2.").arg(m_importController->qrChunksReceived()).arg(m_importController->qrChunksTotal());
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined Q_OS_ANDROID
|
||||
bool ImportUiController::decodeQrCode(const QString &code)
|
||||
{
|
||||
QMutexLocker lock(&qrDecodeMutex);
|
||||
|
||||
if (!mInstance) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!mInstance->m_importController->isQrDecodingActive()) {
|
||||
mInstance->m_importController->startDecodingQr();
|
||||
}
|
||||
return mInstance->parseQrCodeChunk(code);
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user