From fd0b58e05e0d70bfc95cb251e99f094dfe9392ec Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 28 Jan 2015 07:59:34 +0100 Subject: [PATCH] improve check --- editor/kmcomposewin.cpp | 5 ----- .../autotests/potentialphishingemailjobtest.cpp | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp index 7655fbfde..9088958c9 100644 --- a/editor/kmcomposewin.cpp +++ b/editor/kmcomposewin.cpp @@ -3053,7 +3053,6 @@ void KMComposeWin::slotCheckSendNow() PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob(this); KConfigGroup group( KGlobal::config(), "PotentialPhishing"); const QStringList whiteList = group.readEntry("whiteList", QStringList()); - qDebug()<<" whiteList"<setEmailWhiteList(whiteList); QStringList lst; lst << mComposerBase->to(); @@ -3068,15 +3067,11 @@ void KMComposeWin::slotCheckSendNow() void KMComposeWin::slotPotentialPhishingEmailsFound(const QStringList &list) { -#if 1 - slotCheckSendNowStep2(); -#else if (list.isEmpty()) { slotCheckSendNowStep2(); } else { mPotentialPhishingEmailWarning->setPotentialPhisingEmail(list); } -#endif } bool KMComposeWin::checkRecipientNumber() const diff --git a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp index 77f9182dd..f497ce2f8 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp @@ -52,6 +52,7 @@ void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails_data() const QString email = QLatin1String("\"bla@kde.org\" "); QTest::newRow("EmailInWhiteList") << (QStringList() << email) << (QStringList() << email) << false; QTest::newRow("NotAllEmailInWhiteList") << (QStringList() << email << QLatin1String("\"c@kde.org\" ")) << (QStringList() << email) << true; + QTest::newRow("EmailInWhiteListWithSpace") << (QStringList() << QLatin1String(" \"bla@kde.org\" ")) << (QStringList() << email) << false; } void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails()