From 3bddc7cace6b45ae81ce3989f38cdd76b56e9d08 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Thu, 16 Jul 2020 19:41:39 +0800 Subject: [PATCH] tweaking: optimize importing logic this commit will apply a warning to whoever tries to import an http:// link. also this commit tweaks the logic of link trimming. --- src/ui/windows/w_ImportConfig.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ui/windows/w_ImportConfig.cpp b/src/ui/windows/w_ImportConfig.cpp index 6b0c566f..92e0a422 100644 --- a/src/ui/windows/w_ImportConfig.cpp +++ b/src/ui/windows/w_ImportConfig.cpp @@ -168,11 +168,16 @@ void ImportConfigWindow::on_beginImportBtn_clicked() while (!linkList.isEmpty()) { aliasPrefix = nameTxt->text(); - auto link = linkList.takeFirst(); - if (link.trimmed().isEmpty() || link.startsWith("#") || link.startsWith("//")) - { + auto link = linkList.takeFirst().trimmed(); + if (link.isEmpty() || link.startsWith("#") || link.startsWith("//")) 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 newGroupName = ""; const auto config = ConvertConfigFromString(link, &aliasPrefix, &errMessage, &newGroupName);