diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-08-25 00:58:38 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-09-15 16:14:19 +0200 |
commit | 05d54cffc3bd8a50fad195f38a7963a48df779e5 (patch) | |
tree | fcda2685255b27c27dfe50d0312e8e44a2ae69a8 /examples/imapresource/imapserverproxy.cpp | |
parent | 16e63edbc38fca44800df6e9125e1dfc231df1cd (diff) | |
download | sink-05d54cffc3bd8a50fad195f38a7963a48df779e5.tar.gz sink-05d54cffc3bd8a50fad195f38a7963a48df779e5.zip |
Ported to the new API
Diffstat (limited to 'examples/imapresource/imapserverproxy.cpp')
-rw-r--r-- | examples/imapresource/imapserverproxy.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp index 94367d8..82a68cd 100644 --- a/examples/imapresource/imapserverproxy.cpp +++ b/examples/imapresource/imapserverproxy.cpp | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <KIMAP/KIMAP/CapabilitiesJob> | 35 | #include <KIMAP/KIMAP/CapabilitiesJob> |
36 | #include <KIMAP/KIMAP/SearchJob> | 36 | #include <KIMAP/KIMAP/SearchJob> |
37 | 37 | ||
38 | #include <KIMAP/KIMAP/SessionUiProxy> | ||
39 | #include <KCoreAddons/KJob> | 38 | #include <KCoreAddons/KJob> |
40 | 39 | ||
41 | #include "log.h" | 40 | #include "log.h" |
@@ -91,16 +90,13 @@ static KAsync::Job<void> runJob(KJob *job) | |||
91 | }); | 90 | }); |
92 | } | 91 | } |
93 | 92 | ||
94 | class SessionUiProxy : public KIMAP::SessionUiProxy { | ||
95 | public: | ||
96 | bool ignoreSslError( const KSslErrorUiData &errorData ) { | ||
97 | return true; | ||
98 | } | ||
99 | }; | ||
100 | |||
101 | ImapServerProxy::ImapServerProxy(const QString &serverUrl, int port) : mSession(new KIMAP::Session(serverUrl, qint16(port))) | 93 | ImapServerProxy::ImapServerProxy(const QString &serverUrl, int port) : mSession(new KIMAP::Session(serverUrl, qint16(port))) |
102 | { | 94 | { |
103 | mSession->setUiProxy(SessionUiProxy::Ptr(new SessionUiProxy)); | 95 | QObject::connect(mSession, &KIMAP::Session::sslErrors, [this](const QList<QSslError> &errors) { |
96 | SinkLog() << "Got ssl error: " << errors; | ||
97 | mSession->ignoreErrors(errors); | ||
98 | }); | ||
99 | |||
104 | if (Sink::Test::testModeEnabled()) { | 100 | if (Sink::Test::testModeEnabled()) { |
105 | mSession->setTimeout(1); | 101 | mSession->setTimeout(1); |
106 | } else { | 102 | } else { |
@@ -149,9 +145,9 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString | |||
149 | loginJob->setPassword(password); | 145 | loginJob->setPassword(password); |
150 | loginJob->setAuthenticationMode(KIMAP::LoginJob::Plain); | 146 | loginJob->setAuthenticationMode(KIMAP::LoginJob::Plain); |
151 | if (mSession->port() == 143) { | 147 | if (mSession->port() == 143) { |
152 | loginJob->setEncryptionMode(KIMAP::LoginJob::EncryptionMode::TlsV1); | 148 | loginJob->setEncryptionMode(QSsl::TlsV1_0OrLater, true); |
153 | } else { | 149 | } else { |
154 | loginJob->setEncryptionMode(KIMAP::LoginJob::EncryptionMode::AnySslVersion); | 150 | loginJob->setEncryptionMode(QSsl::AnyProtocol, false); |
155 | } | 151 | } |
156 | 152 | ||
157 | auto capabilitiesJob = new KIMAP::CapabilitiesJob(mSession); | 153 | auto capabilitiesJob = new KIMAP::CapabilitiesJob(mSession); |