moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Trim the first value in getHeaderParameters()

Browse Source 
Previously a value like 'text/html ; charset="windows-1251"' for the
Content-Type header would not be decoded correctly.

Fixes issue 4348
This commit is contained in:
cketti 2012-06-18 04:46:46 +02:00
parent ee1288ee75
commit 602ce7be99
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/fsck/k9/mail/internet/MimeUtility.java
View File

@ -956,7 +956,7 @@ public class MimeUtility {
header = header.replaceAll("\r|\n", ""); header = header.replaceAll("\r|\n", "");
String[] parts = header.split(";"); String[] parts = header.split(";");
if (name == null && parts.length > 0) { if (name == null && parts.length > 0) {
return parts[0]; return parts[0].trim();
} }
for (String part : parts) { for (String part : parts) {
if (part.trim().toLowerCase(Locale.US).startsWith(name.toLowerCase(Locale.US))) { if (part.trim().toLowerCase(Locale.US).startsWith(name.toLowerCase(Locale.US))) {

3
tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
View File

@ -35,5 +35,8 @@ public class MimeUtilityTest extends AndroidTestCase {
result = MimeUtility.getHeaderParameter("name=\"\"", "name"); result = MimeUtility.getHeaderParameter("name=\"\"", "name");
assertEquals("", result); assertEquals("", result);
result = MimeUtility.getHeaderParameter("text/html ; charset=\"windows-1251\"", null);
assertEquals("text/html", result);
} }
} }