mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

replace "ISO-8859-1" with StandardCharsets

This commit is contained in:
Unpublished 2019-02-22 16:57:52 +01:00
parent 3285867499
commit 72dcc50ea1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
@ -624,13 +625,10 @@ public class MessageHelper {
if (TextUtils.isEmpty(charset)) { if (TextUtils.isEmpty(charset)) {
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
warnings.add(context.getString(R.string.title_no_charset, ct.toString())); warnings.add(context.getString(R.string.title_no_charset, ct.toString()));
if (part.isMimeType("text/plain")) if (part.isMimeType("text/plain")) {
try { // The first 127 characters are the same as in US-ASCII
// The first 127 characters are the same as in US-ASCII result = new String(result.getBytes(StandardCharsets.ISO_8859_1));
result = new String(result.getBytes("ISO-8859-1")); }
} catch (UnsupportedEncodingException ex) {
warnings.add(Helper.formatThrowable(ex));
}
} else { } else {
if ("US-ASCII".equals(Charset.forName(charset).name()) && if ("US-ASCII".equals(Charset.forName(charset).name()) &&
!"US-ASCII".equals(charset.toUpperCase())) !"US-ASCII".equals(charset.toUpperCase()))