mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-24 02:00:24 +07:00
fix: clear file name to remove header (#1984)
* fix: clear file name to remove header * update: clear on signal * removed uneccessary function * fix: clear filename on invalid config type --------- Co-authored-by: vkamn <vk@amnezia.org>
This commit is contained in:
@@ -208,6 +208,7 @@ bool ImportController::extractConfigFromData(QString data)
|
|||||||
}
|
}
|
||||||
case ConfigTypes::Invalid: {
|
case ConfigTypes::Invalid: {
|
||||||
emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
|
emit importErrorOccurred(ErrorCode::ImportInvalidConfigError, false);
|
||||||
|
m_configFileName.clear();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -341,6 +342,11 @@ void ImportController::importConfig()
|
|||||||
m_maliciousWarningText.clear();
|
m_maliciousWarningText.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ImportController::clearConfigFileName()
|
||||||
|
{
|
||||||
|
m_configFileName.clear();
|
||||||
|
}
|
||||||
|
|
||||||
QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
|
QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
|
||||||
{
|
{
|
||||||
QJsonObject openVpnConfig;
|
QJsonObject openVpnConfig;
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public:
|
|||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void importConfig();
|
void importConfig();
|
||||||
|
void clearConfigFileName();
|
||||||
bool extractConfigFromFile(const QString &fileName);
|
bool extractConfigFromFile(const QString &fileName);
|
||||||
bool extractConfigFromData(QString data);
|
bool extractConfigFromData(QString data);
|
||||||
bool extractConfigFromQr(const QByteArray &data);
|
bool extractConfigFromQr(const QByteArray &data);
|
||||||
|
|||||||
@@ -31,6 +31,14 @@ PageType {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Connections {
|
||||||
|
target: PageController
|
||||||
|
|
||||||
|
function onClosePage() {
|
||||||
|
ImportController.clearConfigFileName()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: ImportController
|
target: ImportController
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user