Detect connection lost so we can go to offline state

kimap should really have better error codes...

3 files changed, 22 insertions, 16 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 0c0c134..3ae7fd7 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -511,6 +511,8 @@ public:
                     return {ApplicationDomain::LoginError, error.errorMessage};
                 case Imap::HostNotFoundError:
                     return {ApplicationDomain::NoServerError, error.errorMessage};
+                case Imap::ConnectionLost:
+                    return {ApplicationDomain::ConnectionLostError, error.errorMessage};
                 default:
                     return {ApplicationDomain::UnknownError, error.errorMessage};
             }
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 538105c..a0f0970 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -80,6 +80,21 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
     });
 }
 
+static int translateImapError(int error)
+{
+    switch (error) {
+        case KJob::UserDefinedError:
+            return Imap::ConnectionLost;
+        case KIMAP2::LoginJob::ErrorCode::ERR_HOST_NOT_FOUND:
+            return Imap::HostNotFoundError;
+        case KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT:
+            return Imap::CouldNotConnectError;
+        case KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED:
+            return Imap::SslHandshakeError;
+    }
+    return Imap::UnknownError;
+}
+
 static KAsync::Job<void> runJob(KJob *job)
 {
     return KAsync::start<void>([job](KAsync::Future<void> &future) {
@@ -87,7 +102,8 @@ static KAsync::Job<void> runJob(KJob *job)
             SinkTrace() << "Job done: " << job->metaObject()->className();
             if (job->error()) {
                 SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
-                future.setError(job->error(), job->errorString());
+                auto proxyError = translateImapError(job->error());
+                future.setError(proxyError, job->errorString());
             } else {
                 future.setFinished();
             }
@@ -166,20 +182,6 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
         // SinkTrace() << "Found personal namespaces: " << mNamespaces.personal;
         // SinkTrace() << "Found shared namespaces: " << mNamespaces.shared;
         // SinkTrace() << "Found user namespaces: " << mNamespaces.user;
-    }).then([=] (const KAsync::Error &error) {
-        if (error) {
-            switch (error.errorCode) {
-            case KIMAP2::LoginJob::ErrorCode::ERR_HOST_NOT_FOUND:
-                return KAsync::error(HostNotFoundError, "Host not found: " + error.errorMessage);
-            case KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT:
-                return KAsync::error(CouldNotConnectError, "Failed to connect: " + error.errorMessage);
-            case KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED:
-                return KAsync::error(SslHandshakeError, "Ssl handshake failed: " + error.errorMessage);
-            default:
-                return KAsync::error(error);
-            }
-        }
-        return KAsync::null();
     });
 }
 
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 82f4f58..f9b854b 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -33,7 +33,9 @@ enum ErrorCode {
     NoError,
     HostNotFoundError,
     CouldNotConnectError,
-    SslHandshakeError
+    SslHandshakeError,
+    ConnectionLost,
+    UnknownError
 };
 
 namespace Flags