wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #776 from k9mail/GH-744_attachment_mime_type

Browse source 
Prefer attachment MIME type from content provider over information from intent

Fixes #744
This commit is contained in:
cketti 2015-09-13 03:03:16 +02:00
commit 065088feb2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java
View file

@ -68,10 +68,11 @@ public class AttachmentInfoLoader extends AsyncTaskLoader<Attachment> {
name = uri.getLastPathSegment();
}
String usableContentType = contentType;
if ((usableContentType == null) || (usableContentType.indexOf('*') != -1)) {
usableContentType = contentResolver.getType(uri);
String usableContentType = contentResolver.getType(uri);
if (usableContentType == null && contentType != null && contentType.indexOf('*') != -1) {
usableContentType = contentType;
}
if (usableContentType == null) {
usableContentType = MimeUtility.getMimeTypeByExtension(name);
}