try to resolve timeouts via NOOP statement in login

2 files changed, 10 insertions, 0 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 89ec7ab..ab20249 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -33,9 +33,14 @@ void IMAPwrapper::login()
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
+        err = mailimap_noop(m_imap);
+        if (err!=MAILIMAP_NO_ERROR) {
+            logout();
+        } else {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
+    }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
         if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 89ec7ab..ab20249 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -33,9 +33,14 @@ void IMAPwrapper::login()
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
+        err = mailimap_noop(m_imap);
+        if (err!=MAILIMAP_NO_ERROR) {
+            logout();
+        } else {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
+    }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
         if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {