From 2ce8dcf40f22dd4e9cf4a6b1c8f5386993ebba6e Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 23 Jun 2016 16:44:12 +0200
Subject: Use username instead of just user

---
 examples/imapresource/imapresource.cpp           | 15 ++++++++++++++-
 examples/imapresource/imapserverproxy.cpp        |  6 +++++-
 examples/imapresource/tests/imapmailsynctest.cpp |  4 ++--
 examples/imapresource/tests/imapmailtest.cpp     |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index a97f860..18747bf 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -294,6 +294,8 @@ public:
     {
         Log() << " Synchronizing";
         return KAsync::start<void>([this](KAsync::Future<void> future) {
+            Trace() << "Connecting to:" << mServer << mPort;
+            Trace() << "as:" << mUser;
             ImapServerProxy imap(mServer, mPort);
             auto loginFuture = imap.login(mUser, mPassword).exec();
             loginFuture.waitForFinished();
@@ -542,8 +544,17 @@ ImapResource::ImapResource(const QByteArray &instanceIdentifier, const QSharedPo
     auto config = ResourceConfig::getConfiguration(instanceIdentifier);
     mServer = config.value("server").toString();
     mPort = config.value("port").toInt();
-    mUser = config.value("user").toString();
+    mUser = config.value("username").toString();
     mPassword = config.value("password").toString();
+    if (mServer.startsWith("imap")) {
+        mServer.remove("imap://");
+        mServer.remove("imaps://");
+    }
+    if (mServer.contains(':')) {
+        auto list = mServer.split(':');
+        mServer = list.at(0);
+        mPort = list.at(1).toInt();
+    }
 
     auto synchronizer = QSharedPointer<ImapSynchronizer>::create(PLUGIN_NAME, instanceIdentifier);
     synchronizer->mServer = mServer;
@@ -603,6 +614,8 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
         scope.mode = KIMAP::FetchJob::FetchScope::Full;
         auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
         auto messageByUid = QSharedPointer<QHash<qint64, Imap::Message>>::create();
+        Trace() << "Connecting to:" << mServer << mPort;
+        Trace() << "as:" << mUser;
         auto inspectionJob = imap->login(mUser, mPassword)
             .then<void>(imap->select(folderRemoteId))
             .then<void>(imap->fetch(set, scope, [imap, messageByUid](const QVector<Imap::Message> &messages) {
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 703caca..fbda02e 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -99,7 +99,11 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
     loginJob->setUserName(username);
     loginJob->setPassword(password);
     loginJob->setAuthenticationMode(KIMAP::LoginJob::Plain);
-    loginJob->setEncryptionMode(KIMAP::LoginJob::EncryptionMode::AnySslVersion);
+    if (mSession->port() == 143) {
+        loginJob->setEncryptionMode(KIMAP::LoginJob::EncryptionMode::TlsV1);
+    } else {
+        loginJob->setEncryptionMode(KIMAP::LoginJob::EncryptionMode::AnySslVersion);
+    }
 
     auto capabilitiesJob = new KIMAP::CapabilitiesJob(mSession);
     QObject::connect(capabilitiesJob, &KIMAP::CapabilitiesJob::capabilitiesReceived, [this](const QStringList &capabilities) {
diff --git a/examples/imapresource/tests/imapmailsynctest.cpp b/examples/imapresource/tests/imapmailsynctest.cpp
index b0d5b22..968cde5 100644
--- a/examples/imapresource/tests/imapmailsynctest.cpp
+++ b/examples/imapresource/tests/imapmailsynctest.cpp
@@ -48,7 +48,7 @@ protected:
         auto resource = ApplicationDomain::ImapResource::create("account1");
         resource.setProperty("server", "localhost");
         resource.setProperty("port", 993);
-        resource.setProperty("user", "doe");
+        resource.setProperty("username", "doe");
         resource.setProperty("password", "doe");
         return resource;
     }
@@ -58,7 +58,7 @@ protected:
         auto resource = ApplicationDomain::ImapResource::create("account1");
         resource.setProperty("server", "foobar");
         resource.setProperty("port", 993);
-        resource.setProperty("user", "doe");
+        resource.setProperty("username", "doe");
         resource.setProperty("password", "doe");
         return resource;
     }
diff --git a/examples/imapresource/tests/imapmailtest.cpp b/examples/imapresource/tests/imapmailtest.cpp
index 82324af..d17d7da 100644
--- a/examples/imapresource/tests/imapmailtest.cpp
+++ b/examples/imapresource/tests/imapmailtest.cpp
@@ -29,7 +29,7 @@ protected:
         auto resource = ApplicationDomain::ImapResource::create("account1");
         resource.setProperty("server", "localhost");
         resource.setProperty("port", 993);
-        resource.setProperty("user", "doe");
+        resource.setProperty("username", "doe");
         resource.setProperty("password", "doe");
         return resource;
     }
-- 
cgit v1.2.3