Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 602ce7be authored by cketti's avatar cketti
Browse files

Trim the first value in getHeaderParameters() 

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

Fixes issue 4348
parent ee1288ee

src/com/fsck/k9/mail/internet/MimeUtility.java

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ public class MimeUtility { 
        header = header.replaceAll("\r|\n", "");

        String[] parts = header.split(";");

        if (name == null && parts.length > 0) {

            return parts[0];

            return parts[0].trim();

        }

        for (String part : parts) {

            if (part.trim().toLowerCase(Locale.US).startsWith(name.toLowerCase(Locale.US))) {

tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java

+3 −0
Original line number Diff line number Diff line
@@ -35,5 +35,8 @@ public class MimeUtilityTest extends AndroidTestCase { 


        result = MimeUtility.getHeaderParameter("name=\"\"", "name");

        assertEquals("", result);



        result = MimeUtility.getHeaderParameter("text/html ; charset=\"windows-1251\"", null);

        assertEquals("text/html", result);

    }

}