[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [messagelib] webengineviewer/src/checkphishingurl: Reduce duplicate code
From:       Montel Laurent <montel () kde ! org>
Date:       2016-11-22 6:15:49
Message-ID: E1c94Mv-0000va-AL () code ! kde ! org
[Download RAW message or body]

Git commit 59caa7270c37c9f9914ce1095d90696b0d7ce91e by Montel Laurent.
Committed on 22/11/2016 at 06:15.
Pushed by mlaurent into branch 'master'.

Reduce duplicate code

M  +10   -8    webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
M  +1    -0    webengineviewer/src/checkphishingurl/localdatabasemanager.h

http://commits.kde.org/messagelib/59caa7270c37c9f9914ce1095d90696b0d7ce91e

diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp index \
                413d3f7..3a52fe9 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
@@ -86,23 +86,25 @@ void LocalDataBaseManager::saveConfig()
     grp.writeEntry(QStringLiteral("DataBaseState"), d->mNewClientState);
 }
 
-void LocalDataBaseManager::downloadPartialDataBase()
+
+void LocalDataBaseManager::downloadDataBase(const QString &clientState)
 {
     setDownloadProgress(true);
     WebEngineViewer::CreatePhishingUrlDataBaseJob *job = new \
                WebEngineViewer::CreatePhishingUrlDataBaseJob(this);
-    job->setDataBaseDownloadNeeded(WebEngineViewer::CreatePhishingUrlDataBaseJob::UpdateDataBase);
                
-    job->setDataBaseState(d->mNewClientState);
+    job->setDataBaseDownloadNeeded(clientState.isEmpty() ? \
WebEngineViewer::CreatePhishingUrlDataBaseJob::FullDataBase : \
WebEngineViewer::CreatePhishingUrlDataBaseJob::UpdateDataBase); +    \
                job->setDataBaseState(clientState);
     connect(job, &CreatePhishingUrlDataBaseJob::finished, this, \
&LocalDataBaseManager::slotDownloadDataBaseFinished);  job->start();
 }
 
+void LocalDataBaseManager::downloadPartialDataBase()
+{
+    downloadDataBase(d->mNewClientState);
+}
+
 void LocalDataBaseManager::downloadFullDataBase()
 {
-    setDownloadProgress(true);
-    WebEngineViewer::CreatePhishingUrlDataBaseJob *job = new \
                WebEngineViewer::CreatePhishingUrlDataBaseJob(this);
-    job->setDataBaseDownloadNeeded(WebEngineViewer::CreatePhishingUrlDataBaseJob::FullDataBase);
                
-    connect(job, &CreatePhishingUrlDataBaseJob::finished, this, \
                &LocalDataBaseManager::slotDownloadDataBaseFinished);
-    job->start();
+    downloadDataBase(QString());
 }
 
 void LocalDataBaseManager::initialize()
diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.h \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.h index 8d57874..7d19576 \
                100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.h
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.h
@@ -67,6 +67,7 @@ private:
     void addElementToDataBase(const QVector<Addition> &additionList);
     void removeElementFromDataBase(const QVector<Removal> &removalList);
     void slotCheckDataBase();
+    void downloadDataBase(const QString &clientState);
 
     QByteArray createHash(const QUrl &url);
     void checkDataBase();


[prev in list] [next in list] [prev in thread] [next in thread]