|
|
@ -1804,8 +1804,9 @@ public class MessageHelper {
|
|
|
|
if (c.equals(StandardCharsets.UTF_8) && !CharsetHelper.isUTF8(result))
|
|
|
|
if (c.equals(StandardCharsets.UTF_8) && !CharsetHelper.isUTF8(result))
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
if (CHARSET16.contains(c))
|
|
|
|
if (CHARSET16.contains(c))
|
|
|
|
break;
|
|
|
|
break; // Can't convert 16 bits charset to 8 bits
|
|
|
|
Log.e("Converting meta=" + c);
|
|
|
|
Charset detected = CharsetHelper.detect(result);
|
|
|
|
|
|
|
|
Log.e("Converting detected=" + detected + " meta=" + c);
|
|
|
|
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);
|
|
|
|
result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
} catch (Throwable ex) {
|
|
|
|