[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [messagelib/Applications/16.08] messagecore: Convert %0A to \n
From:       Montel Laurent <montel () kde ! org>
Date:       2016-07-30 13:14:54
Message-ID: E1bTU6Q-0000wR-M4 () code ! kde ! org
[Download RAW message or body]

Git commit 2ee5bc147480baf205611d333fe68233f9e1aa47 by Montel Laurent.
Committed on 30/07/2016 at 13:14.
Pushed by mlaurent into branch 'Applications/16.08'.

Convert %0A to \n

CCBUG: 363586

M  +1    -1    messagecore/autotests/stringutiltest.cpp
M  +6    -0    messagecore/src/utils/stringutil.cpp

http://commits.kde.org/messagelib/2ee5bc147480baf205611d333fe68233f9e1aa47

diff --git a/messagecore/autotests/stringutiltest.cpp \
b/messagecore/autotests/stringutiltest.cpp index cf467d6..f924d70 100644
--- a/messagecore/autotests/stringutiltest.cpp
+++ b/messagecore/autotests/stringutiltest.cpp
@@ -387,7 +387,7 @@ void StringUtilTest::test_parseMailToBug832795()
     QCOMPARE(data.size(), 4);
     QCOMPARE(data.value(QLatin1String("to")), \
                QLatin1String("832795@bugs.debian.org"));
     QCOMPARE(data.value(QLatin1String("subject")), QLatin1String("Re: kmail: \
                unescaping mailto: links broken"));
-    QCOMPARE(data.value(QLatin1String("body")), QLatin1String("On Thu, 28 Jul \
2016References=<146974194340.26747.4814466130640572267.reportbug@portux.lan.naturalnet.de>body=On \
Thu, 28 Jul 2016 23:39:03 +0200 Dominik George <nik@naturalnet.de> wrote:%0A> \
Package: kmail%0A> Version: 4:16.04.3-1%0A")); +    \
QCOMPARE(data.value(QLatin1String("body")), QLatin1String("On Thu, 28 Jul \
2016References=<146974194340.26747.4814466130640572267.reportbug@portux.lan.naturalnet.de>body=On \
Thu, 28 Jul 2016 23:39:03 +0200 Dominik George <nik@naturalnet.de> wrote:\n> Package: \
kmail\n> Version: 4:16.04.3-1\n"));  }
 
 void StringUtilTest::test_stripOffMessagePrefix_data()
diff --git a/messagecore/src/utils/stringutil.cpp \
b/messagecore/src/utils/stringutil.cpp index 1bdb00c..1e96363 100644
--- a/messagecore/src/utils/stringutil.cpp
+++ b/messagecore/src/utils/stringutil.cpp
@@ -194,6 +194,12 @@ QMap<QString, QString> parseMailtoUrl(const QUrl &url)
         to << toStr;
     }
 
+    QString body = values.value(QStringLiteral("body"));
+    if (!body.isEmpty()) {
+        // Replace Html %0A to \n
+        body = body.replace(QStringLiteral("%0A"), QStringLiteral("\n"));
+        values.insert(QStringLiteral("body"), body);
+    }
     values.insert(QStringLiteral("to"), to.join(QStringLiteral(", ")));
     return values;
 }


[prev in list] [next in list] [prev in thread] [next in thread]