Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 15:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed/simplified charset transformation

Browse Source
This commit is contained in:
M66B
2020-01-31 17:11:36 +01:00
parent 54d6b2b70b
commit 47a0b5e361
4 changed files with 89 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -45,7 +45,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1252,37 +1251,11 @@ public class MessageHelper {
try {
ContentType ct = new ContentType(part.getContentType());
String charset = ct.getParameter("charset");
if (charset == null)
charset = StandardCharsets.ISO_8859_1.name();
else {
charset = charset.replace("\"", "");
charset = MimeUtility.javaCharset(charset);
boolean supported = false;
try {
supported = Charset.isSupported(charset);
} catch (IllegalCharsetNameException ex) {
Log.e(charset, ex);
}
if (!supported) {
// x-binaryenc
// UseInqueCodePage
// none
// unknown-8bit
// X-UNKNOWN
Log.e("Unsupported encoding charset=" + charset);
warnings.add(context.getString(R.string.title_no_charset, charset));
charset = StandardCharsets.ISO_8859_1.name();
}
}
result = new String(result.getBytes(Charset.forName(charset)));
if (UnknownCharsetProvider.charsetForMime(charset) == null)
warnings.add(context.getString(R.string.title_no_charset, charset));
} catch (ParseException ex) {
Log.w(ex);
warnings.add(Log.formatThrowable(ex, false));
Log.e(ex);
}
if (part == plain)