[Pkg-owncloud-commits] [owncloud-client] 69/159: AbstractSslErrorHandler: Also give QSslConfiguration

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 750cdc1910a5a74d85a7fb3be27e3ad1c2acc70c
Author: Markus Goetz <markus at woboq.com>
Date:   Mon Apr 6 21:46:03 2015 +0200

    AbstractSslErrorHandler: Also give QSslConfiguration
---
 src/cmd/simplesslerrorhandler.cpp | 3 ++-
 src/cmd/simplesslerrorhandler.h   | 2 +-
 src/gui/sslerrordialog.cpp        | 3 ++-
 src/gui/sslerrordialog.h          | 2 +-
 src/libsync/account.cpp           | 2 +-
 src/libsync/account.h             | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/cmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp
index c5a98c1..60a68c4 100644
--- a/src/cmd/simplesslerrorhandler.cpp
+++ b/src/cmd/simplesslerrorhandler.cpp
@@ -15,9 +15,10 @@
 #include "account.h"
 #include "simplesslerrorhandler.h"
 
-bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, OCC::AccountPtr account)
+bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr account)
 {
     (void) account;
+    (void) conf;
 
     if (!certs) {
         qDebug() << "Certs parameter required but is NULL!";
diff --git a/src/cmd/simplesslerrorhandler.h b/src/cmd/simplesslerrorhandler.h
index 956c637..11b99a1 100644
--- a/src/cmd/simplesslerrorhandler.h
+++ b/src/cmd/simplesslerrorhandler.h
@@ -20,7 +20,7 @@ class QSslCertificate;
 
 class SimpleSslErrorHandler : public OCC::AbstractSslErrorHandler {
 public:
-    bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, OCC::AccountPtr) Q_DECL_OVERRIDE;
+    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, OCC::AccountPtr) Q_DECL_OVERRIDE;
 };
 
 #endif // SIMPLESSLERRORHANDLER_H
diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index b6c6e2a..ec8acd9 100644
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -34,8 +34,9 @@ namespace Utility {
 }
 #endif
 
-bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr account)
+bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr account)
 {
+	(void) conf;
     if (!certs) {
         qDebug() << "Certs parameter required but is NULL!";
         return false;
diff --git a/src/gui/sslerrordialog.h b/src/gui/sslerrordialog.h
index 885a1e7..68f0fee 100644
--- a/src/gui/sslerrordialog.h
+++ b/src/gui/sslerrordialog.h
@@ -33,7 +33,7 @@ class SslErrorDialog;
 
 class SslDialogErrorHandler : public AbstractSslErrorHandler {
 public:
-    bool handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, AccountPtr) Q_DECL_OVERRIDE;
+    bool handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr) Q_DECL_OVERRIDE;
 };
 
 class SslErrorDialog : public QDialog
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 990b482..465ba0c 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -475,7 +475,7 @@ void Account::slotHandleErrors(QNetworkReply *reply , QList<QSslError> errors)
         return;
     }
 
-    if (_sslErrorHandler->handleErrors(errors, &approvedCerts, sharedFromThis())) {
+    if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) {
         QSslSocket::addDefaultCaCertificates(approvedCerts);
         addApprovedCerts(approvedCerts);
         // all ssl certs are known and accepted. We can ignore the problems right away.
diff --git a/src/libsync/account.h b/src/libsync/account.h
index 3d8604f..19af18f 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -62,7 +62,7 @@ private:
 class AbstractSslErrorHandler {
 public:
     virtual ~AbstractSslErrorHandler() {}
-    virtual bool handleErrors(QList<QSslError>, QList<QSslCertificate>*, AccountPtr) = 0;
+    virtual bool handleErrors(QList<QSslError>, const QSslConfiguration &conf, QList<QSslCertificate>*, AccountPtr) = 0;
 };
 
 /**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git