dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: check if entered text is url

Browse Source
This commit is contained in:
MrMirDan
2026-02-16 14:23:14 +02:00
parent 8fee9864aa
commit 3ef52d14f8
2 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/ui/controllers/importController.cpp
View File

@@ -6,7 +6,6 @@
#include <QRandomGenerator>
#include <QStandardPaths>
#include <QUrlQuery>
#include <QUrl>
#include "core/api/apiDefs.h"
#include "core/api/apiUtils.h"
@@ -105,7 +104,6 @@ bool ImportController::httpGet(const QUrl &url)
QString text;
if (isValidBase64(data)) {
qDebug() << "Data is a base64 string\n";
// decoded = QByteArray::fromBase64(data, QByteArray::Base64UrlEncoding);
decoded = base64Decode(data);
text = QString::fromUtf8(decoded).trimmed();
} else {
@@ -119,13 +117,15 @@ bool ImportController::httpGet(const QUrl &url)
qDebug() << text << "\n";
for (const QString &cfg : configs) {
if (cfg.startsWith("vmess://"))
if (cfg.startsWith("vless://"))
qDebug() << cfg;
else if (cfg.startsWith("vless://"))
else if (cfg.startsWith("vmess://"))
qDebug() << cfg;
else if (cfg.startsWith("trojan://"))
qDebug() << cfg;
else if (cfg.startsWith("ss://"))
qDebug() << cfg;
else if (cfg.startsWith("trojan://"))
else if (cfg.startsWith("ssd://"))
qDebug() << cfg;
else
qDebug() << "Unknown protocol:\n" << cfg.left(10);

47
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View File

@@ -187,47 +187,26 @@ PageType {
text: qsTr("Continue")
function isValidUrl(text) {
try {
var u = new URL(text)
return u.protocol === "http:" || u.protocol === "https:"
} catch(e) {
return false
}
}
clickedFunc: function() {
if (isValidUrl(textKey.textField.text)) {
ImportController.httpGet(textKey.textField.text)
return
}
if (ImportController.extractConfigFromData(textKey.textField.text)) {
PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
}
}
}
TextFieldWithHeaderType {
id: texturl
Layout.fillWidth: true
Layout.topMargin: 32
Layout.rightMargin: 16
Layout.leftMargin: 16
headerText: qsTr("Insert url")
buttonText: qsTr("Insert")
clickedFunc: function() {
textField.text = ""
textField.paste()
}
}
BasicButtonType {
id: urlcontinueButton
Layout.fillWidth: true
Layout.topMargin: 16
Layout.rightMargin: 16
Layout.leftMargin: 16
visible: texturl.textField.text !== ""
text: qsTr("Continue")
clickedFunc: function() {
ImportController.httpGet(texturl.textField.text)
}
}
ParagraphTextType {
Layout.fillWidth: true
Layout.topMargin: 32