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

Switch from using the mime4j charset list to the Java 1.5 java.nio.charset Charset class.

Browse Source 
Based on this comment in MIME4J, this seems like a win:


 * Utility class for working with character sets. It is somewhat similar to
 * the Java 1.4 <code>java.nio.charset.Charset</code> class but knows many
 * more aliases and is compatible with Java 1.3. It will use a simple detection
 * mechanism to detect what character sets the current VM supports. This will
 * be a sub-set of the character sets listed in the
 * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">
 * Java 1.5 (J2SE5.0) Supported Encodings</a> document.
 * <p>
 * The <a href="http://www.iana.org/assignments/character-sets">
 * IANA Character Sets</a> document has been used to determine the preferred
 * MIME character set names and to get a list of known aliases.
 * <p>
This commit is contained in:
Jesse Vincent 2008-11-02 23:17:59 +00:00
parent 27a0efcf1d
commit 8bd2f9c260
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,12 +6,14 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.Base64InputStream;
import org.apache.james.mime4j.decoder.DecoderUtil; import org.apache.james.mime4j.decoder.DecoderUtil;
import org.apache.james.mime4j.decoder.QuotedPrintableInputStream; import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
import org.apache.james.mime4j.util.CharsetUtil;
import android.util.Log; import android.util.Log;
@ -24,6 +26,8 @@ import com.fsck.k9.mail.Multipart;
import com.fsck.k9.mail.Part; import com.fsck.k9.mail.Part;
public class MimeUtility { public class MimeUtility {
public static String unfold(String s) { public static String unfold(String s) {
if (s == null) { if (s == null) {
return null; return null;
@ -129,6 +133,8 @@ public class MimeUtility {
* @throws IOException * @throws IOException
*/ */
public static String getTextFromPart(Part part) { public static String getTextFromPart(Part part) {
Charset mCharsetConverter;
try { try {
if (part != null && part.getBody() != null) { if (part != null && part.getBody() != null) {
InputStream in = part.getBody().getInputStream(); InputStream in = part.getBody().getInputStream();
@ -153,7 +159,8 @@ public class MimeUtility {
/* /*
* See if there is conversion from the MIME charset to the Java one. * See if there is conversion from the MIME charset to the Java one.
*/ */
charset = CharsetUtil.toJavaCharset(charset); mCharsetConverter = Charset.forName(charset);
charset = mCharsetConverter.name();
} }
if (charset != null) { if (charset != null) {
/* /*