github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 19:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

tweaking: optimize importing logic

Browse Source 
this commit will apply a warning to whoever tries to import an http:// link.
also this commit tweaks the logic of link trimming.
This commit is contained in:
DuckSoft 2020-07-16 19:41:39 +08:00
parent e258be6575
commit 3bddc7cace
No known key found for this signature in database
GPG Key ID: 7A3A9FA6E4FD4A8D
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/windows/w_ImportConfig.cpp
View File

@ -168,11 +168,16 @@ void ImportConfigWindow::on_beginImportBtn_clicked()
while (!linkList.isEmpty()) while (!linkList.isEmpty())
{ {
aliasPrefix = nameTxt->text(); aliasPrefix = nameTxt->text();
auto link = linkList.takeFirst(); auto link = linkList.takeFirst().trimmed();
if (link.trimmed().isEmpty() || link.startsWith("#") || link.startsWith("//")) if (link.isEmpty() || link.startsWith("#") || link.startsWith("//"))
{
continue; continue;
// warn if someone tries to import a https:// link
if (link.startsWith("https://"))
{
errorsList->addItem(tr("WARNING: You may have mistaken 'subscription link' with 'share link': %1").arg(link));
} }
QString errMessage; QString errMessage;
QString newGroupName = ""; QString newGroupName = "";
const auto config = ConvertConfigFromString(link, &aliasPrefix, &errMessage, &newGroupName); const auto config = ConvertConfigFromString(link, &aliasPrefix, &errMessage, &newGroupName);