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

Don't pass charset to EncoderUtil.encodeEncodedWord()

Browse source
This commit is contained in:
cketti 2020-10-04 22:41:51 +02:00
parent 267c658492
commit 2a3cc1d422
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mail/common/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java
View file

@ -12,9 +12,7 @@ import org.apache.james.mime4j.Charsets;
* as defined in <a href='http://www.faqs.org/rfcs/rfc2047.html'>RFC 2047</a>
* or display-names of an e-mail address, for example.
*
* This class is copied from the org.apache.james.mime4j.decoder.EncoderUtil class. It's modified here in order to
* encode emoji characters in the Subject headers. The method to decode emoji depends on the MimeMessage class because
* it has to be determined with the sender address.
* This class is copied from the org.apache.james.mime4j.decoder.EncoderUtil class.
*/
class EncoderUtil {
private static final BitSet Q_RESTRICTED_CHARS = initChars("=_?\"#$%&'(),.:;<>@[\\]^`{|}~");
@ -54,21 +52,15 @@ class EncoderUtil {
*
* @param text
* text to encode.
* @param charset
* the Java charset that should be used to encode the specified
* string into a byte array. A suitable charset is detected
* automatically if this parameter is <code>null</code>.
* @return the encoded word (or sequence of encoded words if the given text
* does not fit in a single encoded word).
*/
public static String encodeEncodedWord(String text, Charset charset) {
public static String encodeEncodedWord(String text) {
if (text == null)
throw new IllegalArgumentException();
if (charset == null)
charset = determineCharset(text);
String mimeCharset = CharsetSupport.getExternalCharset(charset.name());
Charset charset = determineCharset(text);
String mimeCharset = charset.name();
byte[] bytes = encode(text, charset);

4
mail/common/src/main/java/com/fsck/k9/mail/internet/MimeHeader.kt
View file

@ -4,7 +4,6 @@ import com.fsck.k9.mail.internet.MimeHeader.Field.NameValueField
import com.fsck.k9.mail.internet.MimeHeader.Field.RawField
import java.io.IOException
import java.io.OutputStream
import java.nio.charset.Charset
import java.util.ArrayList
import java.util.LinkedHashSet
@ -76,8 +75,7 @@ class MimeHeader {
private fun Appendable.appendNameValueField(field: Field) {
val value = field.value
val encodedValue = if (hasToBeEncoded(value)) {
val charset = this@MimeHeader.charset?.let { Charset.forName(it) }
EncoderUtil.encodeEncodedWord(value, charset)
EncoderUtil.encodeEncodedWord(value)
} else {
value
}

2
mail/common/src/test/java/com/fsck/k9/mail/internet/EncoderUtilTest.kt
View file

@ -27,7 +27,7 @@ class EncoderUtilTest {
}
private fun assertInputEncodesToExpected(input: String, expected: String) {
val encodedText = EncoderUtil.encodeEncodedWord(input, null)
val encodedText = EncoderUtil.encodeEncodedWord(input)
assertEquals(expected, encodedText)
}
}