Merge remote-tracking branch 'origin/KDE/4.14'

editor/kmcomposewin.cpp

@@ -2992,7 +2992,6 @@ void KMComposeWin::slotCheckSendNow()
     PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob(this);
     KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishing");
     const QStringList whiteList = group.readEntry("whiteList", QStringList());
-    qDebug()<<" whiteList"<<whiteList;
     job->setEmailWhiteList(whiteList);
     QStringList lst;
     lst << mComposerBase->to();
@@ -3007,15 +3006,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

editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp

@@ -52,6 +52,7 @@ void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails_data()
     const QString email = QLatin1String("\"bla@kde.org\" <foo@kde.org>");
     QTest::newRow("EmailInWhiteList") <<  (QStringList() << email) << (QStringList() << email) << false;
     QTest::newRow("NotAllEmailInWhiteList") <<  (QStringList() << email << QLatin1String("\"c@kde.org\" <dd@kde.org>")) << (QStringList() << email) << true;
+    QTest::newRow("EmailInWhiteListWithSpace") <<  (QStringList() << QLatin1String(" \"bla@kde.org\" <foo@kde.org> ")) << (QStringList() << email) << false;
 }
 
 void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails()

editor/potentialphishingemail/potentialphishingdetaildialog.cpp

@@ -87,15 +87,18 @@ void PotentialPhishingDetailDialog::slotSave()
 {
     KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishing");
     QStringList potentialPhishing = group.readEntry("whiteList", QStringList());
+    bool emailsAdded = false;
     for (int i=0; i < mListWidget->count(); ++i) {
         QListWidgetItem *item = mListWidget->item(i);
         if (item->checkState() == Qt::Checked) {
             QString email = item->text();
             if (!potentialPhishing.contains(email)) {
                 potentialPhishing << email;
+                emailsAdded = true;
             }
         }
     }
-    group.writeEntry( "whiteList", potentialPhishing);
+    if (emailsAdded)
+        group.writeEntry( "whiteList", potentialPhishing);
     accept();
 }