Merge pull request #65 from nemomobile-packages/smtpRecreate

Smtp recreate
sailfishos · Jan 19, 2015 · 4fb106c · 4fb106c
2 parents 5c5428f + 52b5e8c
commit 4fb106c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.cpp b/qmf/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -115,6 +115,8 @@ SmtpClient::SmtpClient(QObject* parent)
     , ssoSessionManager(0)
     , loginFailed(false)
     , sendLogin(false)
+    , recreateIdentity(false)
+    , recreateIdentityCount(0)
 {
     connect(QMailStore::instance(), SIGNAL(accountsUpdated(const QMailAccountIdList&)),
             this, SLOT(accountsUpdated(const QMailAccountIdList&)));
@@ -659,6 +661,9 @@ void SmtpClient::nextAction(const QString &response)
                     operationFailed(QMailServiceAction::Status::ErrLoginFailed, response);
                 }
             }
+        } else if (recreateIdentity && recreateIdentityCount < 5) {
+            sendLogin = true;
+            ssoSessionManager->recreateSsoIdentity();
         } else {
             if (!ssoSessionManager->waitForSso()) {
                 QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities, ssoLogin));
@@ -1186,6 +1191,8 @@ void SmtpClient::onSsoSessionResponse(const QMap<QString, QList<QByteArray> > &s
         ssoLogin = ssoCredentials;
         if (sendLogin) {
             sendLogin = false;
+            recreateIdentity = false;
+            recreateIdentityCount = 0;
             QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities, ssoLogin));
             if (!authCmd.isEmpty()) {
                 sendCommand(authCmd);
@@ -1203,6 +1210,9 @@ void SmtpClient::onSsoSessionError(const QString &error)
     // Reset vars
     loginFailed = false;
     sendLogin = false;
+    recreateIdentity = true;
+    // used to prevent a potencial error loop and mutiple calls to sso
+    recreateIdentityCount++;
     qMailLog(SMTP) <<  "Got SSO error:" << error;
     operationFailed(QMailServiceAction::Status::ErrLoginFailed, error);
 }

diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.h b/qmf/src/plugins/messageservices/smtp/smtpclient.h
@@ -178,6 +178,8 @@ private slots:
     SSOSessionManager* ssoSessionManager;
     bool loginFailed;
     bool sendLogin;
+    bool recreateIdentity;
+    int recreateIdentityCount;
     QMap<QString, QList<QByteArray> > ssoLogin;
 #endif
 };

diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec
@@ -1,6 +1,6 @@
 Name: qmf-qt5
 Summary:    Qt Messaging Framework (QMF) Qt5
-Version:    4.0.4+git38
+Version:    4.0.4+git39
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1 with exception or GPLv3