wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add RFC2047 tests and fix a resulting whitespace bug

Browse source
This commit is contained in:
Philip Whitehouse 2017-09-02 11:17:50 +01:00
parent 0e9e4daa80
commit 498df5db73
2 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
k9mail-library/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java
View file

@ -161,7 +161,7 @@ class DecoderUtil {
sb.append(body.substring(begin, end)); sb.append(body.substring(begin, end));
previousWord = null; previousWord = null;
} else { } else {
sb.append(sep); // sb.append(sep);
} }
} else { } else {
if (previousWord != null) { if (previousWord != null) {
@ -169,11 +169,11 @@ class DecoderUtil {
previousWord.encodedText += word.encodedText; previousWord.encodedText += word.encodedText;
} else { } else {
sb.append(decodeEncodedWord(previousWord)); sb.append(decodeEncodedWord(previousWord));
sb.append(sep); sb.append(sep.trim());
previousWord = word; previousWord = word;
} }
} else { } else {
sb.append(sep); sb.append(sep.trim());
previousWord = word; previousWord = word;
} }
} }

38
k9mail-library/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
View file

@ -194,4 +194,42 @@ public class DecoderUtilTest {
message = null; message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message)); assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
} }
@Test
public void decodeEncodedWords_withRFC2047examples_decodesCorrectly() {
body = "(=?ISO-8859-1?Q?a?=)";
expect = "(a)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a?= b)";
expect = "(a b)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)";
expect = "(ab)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)";
expect = "(ab)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a?= \n =?ISO-8859-1?Q?b?=)";
expect = "(ab)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a_b?=)";
expect = "(a b)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "(=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)";
expect = "(a b)";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
}
} }