Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-01 02:21:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for empty UTF8 decoded subject

Browse Source
This commit is contained in:
M66B
2019-06-01 19:28:51 +02:00
parent 194045c92c
commit d48a87f094
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
@@ -661,7 +662,6 @@ public class MessageHelper {
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
return decodeMime(subject);
} else {
// Fix UTF-8 plain header
try {
@@ -671,14 +671,15 @@ public class MessageHelper {
bytes[i] = (byte) kars[i];
CharsetDecoder cs = StandardCharsets.UTF_8.newDecoder();
cs.decode(ByteBuffer.wrap(bytes));
subject = new String(bytes, StandardCharsets.UTF_8);
CharBuffer out = cs.decode(ByteBuffer.wrap(bytes));
if (out.length() > 0)
subject = new String(bytes, StandardCharsets.UTF_8);
} catch (CharacterCodingException ex) {
Log.w(ex);
}
return decodeMime(subject);
}
return decodeMime(subject);
}
Long getSize() throws MessagingException {