8 files changed, 112 insertions, 18 deletions

diff --git a/noncore/net/mail/abstractmail.cpp b/noncore/net/mail/abstractmail.cpp
index 3d76c96..626b9aa 100644
--- a/noncore/net/mail/abstractmail.cpp
+++ b/noncore/net/mail/abstractmail.cpp
@@ -5,4 +5,6 @@
 
 #include <qstring.h>
+#include <qfile.h>
+#include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
@@ -67,2 +69,15 @@ QString AbstractMail::convert_String(const char*text)
     return QString(text);
 }
+
+/* cp & paste from launcher */
+QString AbstractMail::gen_attachment_id()
+{
+    QFile file( "/proc/sys/kernel/random/uuid" );
+    if (!file.open(IO_ReadOnly ) )
+        return QString::null;
+
+    QTextStream stream(&file);
+
+    return "{" + stream.read().stripWhiteSpace() + "}";
+}
+
diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h
index c16e9c0..8dd2e12 100644
--- a/noncore/net/mail/abstractmail.h
+++ b/noncore/net/mail/abstractmail.h
@@ -31,6 +31,9 @@ public:
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
+
+protected:
     static encodedString*decode_String(const encodedString*text,const QString&enc);
     static QString convert_String(const char*text);
+    static QString gen_attachment_id();
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 3d76c96..626b9aa 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -5,4 +5,6 @@
 
 #include <qstring.h>
+#include <qfile.h>
+#include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
@@ -67,2 +69,15 @@ QString AbstractMail::convert_String(const char*text)
     return QString(text);
 }
+
+/* cp & paste from launcher */
+QString AbstractMail::gen_attachment_id()
+{
+    QFile file( "/proc/sys/kernel/random/uuid" );
+    if (!file.open(IO_ReadOnly ) )
+        return QString::null;
+
+    QTextStream stream(&file);
+
+    return "{" + stream.read().stripWhiteSpace() + "}";
+}
+
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index c16e9c0..8dd2e12 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -31,6 +31,9 @@ public:
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
+
+protected:
     static encodedString*decode_String(const encodedString*text,const QString&enc);
     static QString convert_String(const char*text);
+    static QString gen_attachment_id();
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 65cd4ba..d3447f4 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -17,4 +17,5 @@ POP3wrapper::POP3wrapper( POP3account *a )
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
+    bodyCache.clear();
 }
 
@@ -26,4 +27,16 @@ POP3wrapper::~POP3wrapper()
         msg_cache.remove();
     }
+    cleanUpCache();
+}
+
+void POP3wrapper::cleanUpCache()
+{
+    QMap<QString,encodedString*>::Iterator it = bodyCache.begin();
+    for (;it!=bodyCache.end();++it) {
+        encodedString*t = it.data();
+        //it.setValue(0);
+        if (t) delete t;
+    }
+    bodyCache.clear();
 }
 
@@ -52,4 +65,5 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
         return body;
     }
+    cleanUpCache();
     if (mail.getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
@@ -406,7 +420,10 @@ QList<Folder>* POP3wrapper::listFolders()
 }
 
-QString POP3wrapper::fetchTextPart(const RecMail&,const RecPart&)
+QString POP3wrapper::fetchTextPart(const RecMail&mail,const RecPart&part)
 {
-    return "";
+    encodedString*t = fetchDecodedPart(mail,part);
+    QString text=t->Content();
+    delete t;
+    return text;
 }
 
@@ -425,12 +442,18 @@ void POP3wrapper::answeredMail(const RecMail&)
 }
 
-encodedString* POP3wrapper::fetchDecodedPart(const RecMail&,const RecPart&)
+encodedString* POP3wrapper::fetchDecodedPart(const RecMail&,const RecPart&part)
 {
-    return new encodedString();
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    if (it==bodyCache.end()) return new encodedString();
+    encodedString*t = decode_String(it.data(),part.Encoding());
+    return t;
 }
 
-encodedString* POP3wrapper::fetchRawPart(const RecMail&,const RecPart&)
+encodedString* POP3wrapper::fetchRawPart(const RecMail&mail,const RecPart&part)
 {
-    return new encodedString();
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    if (it==bodyCache.end()) return new encodedString();
+    encodedString*t = it.data();
+    return t;
 }
 
@@ -466,6 +489,7 @@ void POP3wrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,
             target.setDescription(part);
         } else {
-            /* TODO: Add the content to a list and store it for later use */
-            if (data) free(data);
+            b = gen_attachment_id();
+            part.setIdentifier(b);
+            bodyCache[b]=new encodedString(data,len);
             target.addPart(part);
         }
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index b17928e..a31a145 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -4,4 +4,6 @@
 #include "mailwrapper.h"
 #include "abstractmail.h"
+#include <qmap.h>
+#include <qstring.h>
 
 class RecMail;
@@ -45,5 +47,7 @@ protected:
     QString parseDateTime( mailimf_date_time *date );
     
-    static void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
+    void cleanUpCache();
+    
+    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
     static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPart&target,clist*parameters);
@@ -54,4 +58,5 @@ protected:
     QString msgTempName;
     unsigned int last_msg_id;
+    QMap<QString,encodedString*> bodyCache;
 };
 
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 65cd4ba..d3447f4 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -17,4 +17,5 @@ POP3wrapper::POP3wrapper( POP3account *a )
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
+    bodyCache.clear();
 }
 
@@ -26,4 +27,16 @@ POP3wrapper::~POP3wrapper()
         msg_cache.remove();
     }
+    cleanUpCache();
+}
+
+void POP3wrapper::cleanUpCache()
+{
+    QMap<QString,encodedString*>::Iterator it = bodyCache.begin();
+    for (;it!=bodyCache.end();++it) {
+        encodedString*t = it.data();
+        //it.setValue(0);
+        if (t) delete t;
+    }
+    bodyCache.clear();
 }
 
@@ -52,4 +65,5 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
         return body;
     }
+    cleanUpCache();
     if (mail.getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
@@ -406,7 +420,10 @@ QList<Folder>* POP3wrapper::listFolders()
 }
 
-QString POP3wrapper::fetchTextPart(const RecMail&,const RecPart&)
+QString POP3wrapper::fetchTextPart(const RecMail&mail,const RecPart&part)
 {
-    return "";
+    encodedString*t = fetchDecodedPart(mail,part);
+    QString text=t->Content();
+    delete t;
+    return text;
 }
 
@@ -425,12 +442,18 @@ void POP3wrapper::answeredMail(const RecMail&)
 }
 
-encodedString* POP3wrapper::fetchDecodedPart(const RecMail&,const RecPart&)
+encodedString* POP3wrapper::fetchDecodedPart(const RecMail&,const RecPart&part)
 {
-    return new encodedString();
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    if (it==bodyCache.end()) return new encodedString();
+    encodedString*t = decode_String(it.data(),part.Encoding());
+    return t;
 }
 
-encodedString* POP3wrapper::fetchRawPart(const RecMail&,const RecPart&)
+encodedString* POP3wrapper::fetchRawPart(const RecMail&mail,const RecPart&part)
 {
-    return new encodedString();
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    if (it==bodyCache.end()) return new encodedString();
+    encodedString*t = it.data();
+    return t;
 }
 
@@ -466,6 +489,7 @@ void POP3wrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,
             target.setDescription(part);
         } else {
-            /* TODO: Add the content to a list and store it for later use */
-            if (data) free(data);
+            b = gen_attachment_id();
+            part.setIdentifier(b);
+            bodyCache[b]=new encodedString(data,len);
             target.addPart(part);
         }
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index b17928e..a31a145 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -4,4 +4,6 @@
 #include "mailwrapper.h"
 #include "abstractmail.h"
+#include <qmap.h>
+#include <qstring.h>
 
 class RecMail;
@@ -45,5 +47,7 @@ protected:
     QString parseDateTime( mailimf_date_time *date );
     
-    static void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
+    void cleanUpCache();
+    
+    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
     static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPart&target,clist*parameters);
@@ -54,4 +58,5 @@ protected:
     QString msgTempName;
     unsigned int last_msg_id;
+    QMap<QString,encodedString*> bodyCache;
 };