msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Charset text/plain simplification

Browse Source
pull/199/head
M66B 4 years ago
parent 400a85da3e
commit f87d59a7f3
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -1884,22 +1884,19 @@ public class MessageHelper {
} }
if (h.isPlainText()) { if (h.isPlainText()) {
if (charset == null || StandardCharsets.ISO_8859_1.equals(cs)) { if (StandardCharsets.ISO_8859_1.equals(cs) && CharsetHelper.isUTF8(result)) {
Log.i("Charset upgrade=UTF8");
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
} else if (charset == null) {
Charset detected = CharsetHelper.detect(result); Charset detected = CharsetHelper.detect(result);
if (StandardCharsets.ISO_8859_1.equals(cs) && if (detected == null) {
StandardCharsets.UTF_8.equals(detected)) { if (CharsetHelper.isUTF8(result)) {
Log.i("Charset upgrade=UTF8"); Log.i("Charset plain=UTF8");
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
} else {
if (detected == null) {
if (CharsetHelper.isUTF8(result)) {
Log.i("Charset plain=UTF8");
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
}
} else {
Log.i("Charset plain=" + detected.name());
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), detected);
} }
} else {
Log.i("Charset plain=" + detected.name());
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), detected);
} }
} }

Write Preview
Loading…
Cancel
Save