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

Small improvement

This commit is contained in:
M66B 2024-01-24 11:02:41 +01:00
parent 8e91278ec9
commit 371b858a13
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/sun/mail/handlers/text_plain.java
View File

@ -59,7 +59,7 @@ public class text_plain extends handler_base {
try {
enc = getCharset(ds.getContentType());
is = new InputStreamReader(ds.getInputStream(), enc);
} catch (IllegalArgumentException iex) {
} catch (UnsupportedEncodingException | IllegalArgumentException iex) {
/*
* An unknown charset of the form ISO-XXX-XXX will cause
* the JDK to throw an IllegalArgumentException. The
@ -68,9 +68,12 @@ public class text_plain extends handler_base {
* and this results in an IllegalArgumentException, rather than
* the expected UnsupportedEncodingException. Yikes.
*/
//throw new UnsupportedEncodingException(enc);
is = new InputStreamReader(ds.getInputStream(),
eu.faircode.email.UnknownCharsetProvider.charsetForMime(getCharset(ds.getContentType())));
try {
is = new InputStreamReader(ds.getInputStream(),
eu.faircode.email.UnknownCharsetProvider.charsetForMime(getCharset(ds.getContentType())));
} catch (IllegalArgumentException ex) {
throw new UnsupportedEncodingException(enc);
}
}
try {
@ -118,7 +121,7 @@ public class text_plain extends handler_base {
try {
enc = getCharset(type);
osw = new OutputStreamWriter(new NoCloseOutputStream(os), enc);
} catch (IllegalArgumentException iex) {
} catch (UnsupportedEncodingException | IllegalArgumentException iex) {
/*
* An unknown charset of the form ISO-XXX-XXX will cause
* the JDK to throw an IllegalArgumentException. The
@ -127,9 +130,12 @@ public class text_plain extends handler_base {
* and this results in an IllegalArgumentException, rather than
* the expected UnsupportedEncodingException. Yikes.
*/
//throw new UnsupportedEncodingException(enc);
osw = new OutputStreamWriter(new NoCloseOutputStream(os),
eu.faircode.email.UnknownCharsetProvider.charsetForMime(getCharset(type)));
try {
osw = new OutputStreamWriter(new NoCloseOutputStream(os),
eu.faircode.email.UnknownCharsetProvider.charsetForMime(getCharset(type)));
} catch (IllegalArgumentException ex) {
throw new UnsupportedEncodingException(enc);
}
}
String s = (String)obj;