Merge pull request #17 from LascauxSRL/master

Added support for ByteArray Attachments and removed Memory Leak from MimeMessage class

src/mimeattachment.cpp

@@ -24,6 +24,10 @@
 MimeAttachment::MimeAttachment(QFile *file)
     : MimeFile(file)
 {
+}
+MimeAttachment::MimeAttachment(const QByteArray& stream, const QString& fileName): MimeFile(stream, fileName)
+{
+
 }
 
 MimeAttachment::~MimeAttachment()

src/mimeattachment.h

@@ -31,6 +31,8 @@ public:
     /* [1] Constructors and Destructors */
 
     MimeAttachment(QFile* file);
+    MimeAttachment(const QByteArray& stream, const QString& fileName);
+
     ~MimeAttachment();
 
     /* [1] --- */

src/mimefile.cpp

@@ -28,9 +28,18 @@ MimeFile::MimeFile(QFile *file)
     this->cName = QFileInfo(*file).fileName();
     this->cEncoding = Base64;
 }
+MimeFile::MimeFile(const QByteArray& stream, const QString& fileName)
+{
+    this->cEncoding = Base64;
+    this->cType = "application/octet-stream";
+    this->file = 0;
+    this->cName = fileName;
+    this->content = stream;
+}
 
 MimeFile::~MimeFile()
 {
+  if (file)
     delete file;
 }
 
@@ -45,11 +54,13 @@ MimeFile::~MimeFile()
 /* [3] Protected methods */
 
 void MimeFile::prepare()
+{
+  if (this->file)
   {
     file->open(QIODevice::ReadOnly);
     this->content = file->readAll();
     file->close();
-
+  }
     /* !!! IMPORTANT !!!! */
     MimePart::prepare();
 }

src/mimefile.h

@@ -29,6 +29,7 @@ public:
 
     /* [1] Constructors and Destructors */
 
+    MimeFile(const QByteArray& stream, const QString& fileName);
     MimeFile(QFile *f);
     ~MimeFile();
 

src/mimemessage.cpp

@@ -23,16 +23,22 @@
 #include <typeinfo>
 
 /* [1] Constructors and Destructors */
-
 MimeMessage::MimeMessage(bool createAutoMimeContent) :
     hEncoding(MimePart::_8Bit)
 {
     if (createAutoMimeContent)
         this->content = new MimeMultiPart();
+    
+    autoMimeContentCreated = createAutoMimeContent;
 }
 
 MimeMessage::~MimeMessage()
 {
+    if (this->autoMimeContentCreated)
+    {
+      this->autoMimeContentCreated = false;
+      delete (this->content);
+    }
 }
 
 /* [1] --- */
@@ -44,6 +50,11 @@ MimePart& MimeMessage::getContent() {
 }
 
 void MimeMessage::setContent(MimePart *content) {
+    if (this->autoMimeContentCreated)
+    {
+      this->autoMimeContentCreated = false;
+      delete (this->content);
+    }
     this->content = content;
 }
 

src/mimemessage.h

@@ -78,6 +78,7 @@ protected:
     QList<EmailAddress*> recipientsTo, recipientsCc, recipientsBcc;
     QString subject;
     MimePart *content;
+    bool autoMimeContentCreated;
     
     MimePart::Encoding hEncoding;
 

src/smtpclient.cpp

@@ -28,7 +28,8 @@ SmtpClient::SmtpClient(const QString & host, int port, ConnectionType connection
     name("localhost"),
     authMethod(AuthPlain),
     connectionTimeout(5000),
-    responseTimeout(5000)
+    responseTimeout(5000),
+    sendMessageTimeout(60000)
 {
     setConnectionType(connectionType);
 
@@ -163,6 +164,14 @@ void SmtpClient::setResponseTimeout(int msec)
 {
     responseTimeout = msec;
 }
+int SmtpClient::getSendMessageTimeout() const
+{
+  return sendMessageTimeout;
+}
+void SmtpClient::setSendMessageTimeout(int msec)
+{
+  sendMessageTimeout = msec;
+}
 
 /* [2] --- */
 
@@ -233,7 +242,7 @@ bool SmtpClient::connectToHost()
 
             if (!((QSslSocket*) socket)->waitForEncrypted(connectionTimeout)) {
                 qDebug() << ((QSslSocket*) socket)->errorString();
-                emit SmtpError(ConnectionTimeoutError);
+                emit smtpError(ConnectionTimeoutError);
                 return false;
             }
 
@@ -254,6 +263,10 @@ bool SmtpClient::connectToHost()
     {
         return false;
     }
+    catch (SendMessageTimeoutException)
+    {
+        return false;
+    }
 
     // If no errors occured the function returns true.
     return true;
@@ -318,6 +331,12 @@ bool SmtpClient::login(const QString &user, const QString &password, AuthMethod
         emit smtpError(AuthenticationFailedError);
         return false;
     }
+    catch (SendMessageTimeoutException)
+    {
+	// Send Timeout exceeded
+        emit smtpError(AuthenticationFailedError);
+        return false;
+    }
 
     return true;
 }
@@ -384,6 +403,10 @@ bool SmtpClient::sendMail(MimeMessage& email)
     {
         return false;
     }
+    catch (SendMessageTimeoutException)
+    {
+        return false;
+    }
 
     return true;
 }
@@ -425,9 +448,14 @@ void SmtpClient::waitForResponse() throw (ResponseTimeoutException)
     } while (true);
 }
 
-void SmtpClient::sendMessage(const QString &text)
+void SmtpClient::sendMessage(const QString &text) throw (SendMessageTimeoutException)
 {
     socket->write(text.toUtf8() + "\r\n");
+    if (! socket->waitForBytesWritten(sendMessageTimeout))
+    {
+      emit smtpError(SendDataTimeoutError);
+      throw SendMessageTimeoutException();
+    }
 }
 
 /* [4] --- */

src/smtpclient.h

@@ -42,6 +42,7 @@ public:
     {
         ConnectionTimeoutError,
         ResponseTimeoutError,
+        SendDataTimeoutError,
         AuthenticationFailedError,
         ServerError,    // 4xx smtp error
         ClientError     // 5xx smtp error
@@ -98,6 +99,9 @@ public:
     int getResponseTimeout() const;
     void setResponseTimeout(int msec);
     
+    int getSendMessageTimeout() const;
+    void setSendMessageTimeout(int msec);
+
     QTcpSocket* getSocket();
 
 
@@ -135,12 +139,15 @@ protected:
 
     int connectionTimeout;
     int responseTimeout;
+    int sendMessageTimeout;
+    
     
     QString responseText;
     int responseCode;
 
 
     class ResponseTimeoutException {};
+    class SendMessageTimeoutException {};
 
     /* [4] --- */
 
@@ -149,7 +156,7 @@ protected:
 
     void waitForResponse() throw (ResponseTimeoutException);
 
-    void sendMessage(const QString &text);
+    void sendMessage(const QString &text) throw (SendMessageTimeoutException);
 
     /* [5] --- */