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

List:       kde-commits
Subject:    [messagelib] webengineviewer/src/checkphishingurl: Rename method
From:       Montel Laurent <montel () kde ! org>
Date:       2016-12-10 6:20:41
Message-ID: E1cFb1V-0004xC-8f () code ! kde ! org
[Download RAW message or body]

Git commit 89b7e72822532d39e840dfe886a20e54f04a2110 by Montel Laurent.
Committed on 10/12/2016 at 06:20.
Pushed by mlaurent into branch 'master'.

Rename method

M  +1    -1    webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.cpp
 M  +1    -1    webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
M  +9    -3    webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
M  +1    -1    webengineviewer/src/checkphishingurl/searchfullhashjob.h
M  +1    -1    webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp

https://commits.kde.org/messagelib/89b7e72822532d39e840dfe886a20e54f04a2110

diff --git a/webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.cpp \
b/webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.cpp index \
                3bfaba17..e9f1570e 100644
--- a/webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.cpp
@@ -68,7 +68,7 @@ void SearchFullHashJobTest::shouldCreateRequest()
     job.setDatabaseState(databaseHash);
     job.setSearchFullHashForUrl(url);
     if (!hash.isEmpty()) {
-        job.setSearchHash(QList<QByteArray>() << hash);
+        job.setSearchHashs(QList<QByteArray>() << hash);
     }
     QCOMPARE(job.canStart(), canStart);
     if (canStart) {
diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp index \
                c2d92af4..9e65ff7e 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
@@ -241,7 +241,7 @@ void LocalDataBaseManager::checkUrl(const QUrl &url)
             } else {
                 WebEngineViewer::SearchFullHashJob *job = new \
                WebEngineViewer::SearchFullHashJob(this);
                 job->setDatabaseState(QStringList() << d->mNewClientState);
-                job->setSearchHash(conflictHashs);
+                job->setSearchHashs(conflictHashs);
                 connect(job, &SearchFullHashJob::result, this, \
&LocalDataBaseManager::slotSearchOnServerResult);  job->start();
             }
diff --git a/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp \
b/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp index 1a1f058a..b08e33b2 \
                100644
--- a/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
+++ b/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
@@ -38,6 +38,7 @@ public:
     {
 
     }
+    bool foundExactHash(const QList<QByteArray> &listLongHash);
     QList<QByteArray> mHashs;
     QUrl mUrl;
     QStringList mDatabaseHashes;
@@ -129,8 +130,8 @@ void SearchFullHashJob::parse(const QByteArray &replyStr)
                         const QByteArray hashStr = urlMapIt.value().toByteArray();
                         hashList << hashStr;
                     }
-                    //TODO check if it's the malware url
-                    if (!hashList.isEmpty()) {
+
+                    if (d->foundExactHash(hashList)) {
                         Q_EMIT result(WebEngineViewer::SearchFullHashJob::MalWare, \
d->mUrl);  } else {
                         Q_EMIT result(WebEngineViewer::SearchFullHashJob::Unknown, \
d->mUrl); @@ -151,13 +152,18 @@ void SearchFullHashJob::parse(const QByteArray \
&replyStr)  deleteLater();
 }
 
+bool SearchFullHashJobPrivate::foundExactHash(const QList<QByteArray> &listLongHash)
+{
+    return false;
+}
+
 void SearchFullHashJob::slotCheckUrlFinished(QNetworkReply *reply)
 {
     parse(reply->readAll());
     reply->deleteLater();
 }
 
-void SearchFullHashJob::setSearchHash(const QList<QByteArray> &hash)
+void SearchFullHashJob::setSearchHashs(const QList<QByteArray> &hash)
 {
     d->mHashs = hash;
 }
diff --git a/webengineviewer/src/checkphishingurl/searchfullhashjob.h \
b/webengineviewer/src/checkphishingurl/searchfullhashjob.h index 3b97a4ba..2f4965fb \
                100644
--- a/webengineviewer/src/checkphishingurl/searchfullhashjob.h
+++ b/webengineviewer/src/checkphishingurl/searchfullhashjob.h
@@ -53,7 +53,7 @@ public:
     QByteArray jsonRequest() const;
     void parse(const QByteArray &replyStr);
 
-    void setSearchHash(const QList<QByteArray> &hash);
+    void setSearchHashs(const QList<QByteArray> &hash);
 Q_SIGNALS:
     void result(WebEngineViewer::SearchFullHashJob::UrlStatus status, const QUrl \
&url);  void debugJson(const QByteArray &ba);
diff --git a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp \
b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp index \
                74bee60f..80de2702 100644
--- a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp
+++ b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp
@@ -84,7 +84,7 @@ void SearchFullHashGui::slotCheckUrl()
     connect(job, &WebEngineViewer::SearchFullHashJob::result, this, \
                &SearchFullHashGui::slotGetResult);
     connect(job, &WebEngineViewer::SearchFullHashJob::debugJson, this, \
&SearchFullHashGui::slotJSonDebug);  job->setDatabaseState(QStringList() << \
                databaseHashStr);
-    job->setSearchHash(QList<QByteArray>() << hashStr.toLatin1());
+    job->setSearchHashs(QList<QByteArray>() << hashStr.toLatin1());
 
     job->start();
 }


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