mirror of https://github.com/M66B/FairEmail.git
Charset restoration
This commit is contained in:
parent
8976bee654
commit
09b9e5557b
|
@ -1884,21 +1884,22 @@ public class MessageHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (h.isPlainText()) {
|
if (h.isPlainText()) {
|
||||||
if (StandardCharsets.ISO_8859_1.equals(cs) && CharsetHelper.isUTF8(result)) {
|
if (charset == null || StandardCharsets.ISO_8859_1.equals(cs))
|
||||||
Log.i("Charset upgrade=UTF8");
|
if (StandardCharsets.ISO_8859_1.equals(cs) && CharsetHelper.isUTF8(result)) {
|
||||||
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
|
Log.i("Charset upgrade=UTF8");
|
||||||
} else if (charset == null) {
|
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
|
||||||
Charset detected = CharsetHelper.detect(result);
|
|
||||||
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 {
|
} else {
|
||||||
Log.i("Charset plain=" + detected.name());
|
Charset detected = CharsetHelper.detect(result);
|
||||||
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), detected);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ("flowed".equalsIgnoreCase(h.contentType.getParameter("format")))
|
if ("flowed".equalsIgnoreCase(h.contentType.getParameter("format")))
|
||||||
result = HtmlHelper.flow(result);
|
result = HtmlHelper.flow(result);
|
||||||
|
|
Loading…
Reference in New Issue