I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle attachments with incorrect MIME types

Browse Source
This commit is contained in:
str4d
2015-01-12 10:08:22 +00:00
parent fe54c00fa0
commit 20c2b1eb87
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/i2p/bote/android/provider/AttachmentProvider.java
View File

@@ -16,6 +16,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import javax.activation.MimetypesFileTypeMap;
import javax.mail.MessagingException;
import javax.mail.Part;
@@ -102,8 +103,29 @@ public class AttachmentProvider extends ContentProvider {
String contentType = attachment.getContentType();
// Remove any "; name=fileName" suffix
int delim = contentType.indexOf(';');
if (delim >= 0)
if (delim >= 0) {
String params = contentType.substring(delim + 1);
contentType = contentType.substring(0, delim);
// Double-check in case the attachment was created by an old
// I2P-Bote version that didn't detect MIME types correctly.
if ("application/octet-stream".equals(contentType)) {
// Find the filename
String filename = "";
delim = params.indexOf("name=");
if (delim >= 0) {
filename = params.substring(delim + 5);
delim = filename.indexOf(' ');
if (delim >= 0)
filename = params.substring(0, delim);
}
if (!filename.isEmpty()) {
MimetypesFileTypeMap mimeTypeMap = new MimetypesFileTypeMap();
contentType = mimeTypeMap.getContentType(filename);
}
}
}
return contentType;
}
} catch (PasswordException e) {