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

Charset improvements

Browse Source
This commit is contained in:
M66B
2019-09-25 08:32:05 +02:00
parent 53da2fef86
commit 4e1e9db314
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -882,15 +882,19 @@ public class MessageHelper {
if (charset != null) {
charset = charset.replace("\"", "");
if ("ASCII".equals(charset.toUpperCase()))
charset = "us-ascii";
charset = "US-ASCII";
}
if (TextUtils.isEmpty(charset) || "US-ASCII".equals(charset.toUpperCase())) {
// The first 127 characters are the same as in US-ASCII
result = new String(result.getBytes(StandardCharsets.ISO_8859_1));
} else {
if ("US-ASCII".equals(Charset.forName(charset).name()))
// See UnknownCharsetProvider class
if ("US-ASCII".equals(Charset.forName(charset).name())) {
Log.w("Unsupported encoding charset=" + charset);
warnings.add(context.getString(R.string.title_no_charset, charset));
result = new String(result.getBytes(StandardCharsets.ISO_8859_1));
}
}
} catch (ParseException ex) {
Log.w(ex);

6
app/src/main/java/eu/faircode/email/UnknownCharsetProvider.java
View File

@@ -20,6 +20,7 @@ package eu.faircode.email;
*/
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.spi.CharsetProvider;
import java.util.Collections;
import java.util.Iterator;
@@ -36,8 +37,9 @@ public class UnknownCharsetProvider extends CharsetProvider {
// UseInqueCodePage
// none
// unknown-8bit
// X-UNKNOWN
// https://javaee.github.io/javamail/FAQ#unsupen
Log.w("Unknown charset=" + name);
return Charset.forName("US-ASCII");
Log.e("Unknown charset=" + name);
return StandardCharsets.US_ASCII;
}
}