From 7a6dacff9f6a3af127684ac54ec3550786cd4d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 21 Oct 2014 21:00:00 +0200 Subject: [PATCH] clean up debugs and fix encryption error on SSL connection --- .../deviceplugins/mailnotification/smtpclient.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/deviceplugins/mailnotification/smtpclient.cpp b/plugins/deviceplugins/mailnotification/smtpclient.cpp index f89de3ec..86e7c6d2 100644 --- a/plugins/deviceplugins/mailnotification/smtpclient.cpp +++ b/plugins/deviceplugins/mailnotification/smtpclient.cpp @@ -93,7 +93,6 @@ void SmtpClient::readData() switch (m_state) { case InitState: if(responseLine == "220"){ - qDebug() << "Init"; send("EHLO localhost"); if(m_encryptionType == EncryptionNone){ m_state = AuthentificationState; @@ -111,14 +110,16 @@ void SmtpClient::readData() break; case HandShakeState: if(responseLine == "250"){ - qDebug() << "Handshake"; - m_socket->startClientEncryption(); + if(!m_socket->isEncrypted() && m_encryptionType != EncryptionNone){ + m_socket->startClientEncryption(); + } send("EHLO localhost"); m_state = AuthentificationState; } if(responseLine == "220"){ - qDebug() << "TLS Handshake"; - m_socket->startClientEncryption(); + if(!m_socket->isEncrypted() && m_encryptionType != EncryptionNone){ + m_socket->startClientEncryption(); + } send("EHLO localhost"); m_state = AuthentificationState; } @@ -131,7 +132,6 @@ void SmtpClient::readData() break; case AuthentificationState: if(responseLine == "250"){ - qDebug() << "Autentificate"; if(m_authMethod == AuthLogin){ send("AUTH LOGIN"); m_state = UserState;