Extract code for allowing to autotest code

messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp

@@ -20,7 +20,7 @@
 
 #include "messageviewer_debug.h"
 #include "viewer/webengine/mailwebengineview.h"
-
+#include "messageviewer/messageviewerutil.h"
 #include <QUrl>
 
 #include <cassert>
@@ -72,15 +72,8 @@ void WebEnginePartHtmlWriter::end()
     mTempFile = new QTemporaryFile(QDir::tempPath() + QLatin1String("/messageviewer_XXXXXX")+ QLatin1String(".html"));
     mTempFile->open();
     QTextStream stream(mTempFile);
-    //TODO we need to change codec when mail use different codec.
-    QByteArray codecValue = codec();
-    if (codecValue.isEmpty()) {
-        codecValue = QByteArray("UTF-8");
-    }
-    //qDebug() << " codecValue ******************************************: " << codecValue;
-    if (data().contains("<meta charset=\"utf-8\">")) {
-        codecValue = QByteArray("UTF-8");
-    }
+
+    const QByteArray codecValue = Util::htmlCodec(data(), codec());
     stream.setCodec(codecValue.constData());
     stream << data();
 

messageviewer/src/utils/messageviewerutil.cpp

@@ -735,3 +735,17 @@ QString Util::processHtml(const QString &htmlSource, QString &extraHead)
     s = textBeforeDoctype + s;
     return s;
 }
+
+
+QByteArray Util::htmlCodec(const QByteArray &data, const QByteArray &codec)
+{
+    QByteArray currentCodec = codec;
+    if (currentCodec.isEmpty()) {
+        currentCodec = QByteArray("UTF-8");
+    }
+    //qDebug() << " codecValue ******************************************: " << codecValue;
+    if (data.contains("<meta charset=\"utf-8\">")) {
+        currentCodec = QByteArray("UTF-8");
+    }
+    return currentCodec;
+}

messageviewer/src/utils/messageviewerutil.h

@@ -73,6 +73,7 @@ Q_REQUIRED_RESULT MESSAGEVIEWER_EXPORT bool excludeExtraHeader(const QString &s)
 MESSAGEVIEWER_EXPORT const QTextCodec *codecForName(const QByteArray &_str);
 
 Q_REQUIRED_RESULT MESSAGEVIEWER_EXPORT QString processHtml(const QString &htmlSource, QString &extraHead);
+Q_REQUIRED_RESULT MESSAGEVIEWER_EXPORT QByteArray htmlCodec(const QByteArray &data, const QByteArray &currentCodec);
 }
 }
 Q_DECLARE_METATYPE(KService::Ptr)