ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to handle IMAP/POP mime types better

Browse Source 
* When we get a "generic" type, try to infer a better one from
  the filename extension (as Exchange already does)
* Also, remove unused method

Bug: 6713335
Change-Id: I540a92aabd13bc1d30ce1838129a86f5eaf3564e
This commit is contained in:
Marc Blank 2012-06-22 11:38:33 -07:00
parent 1d229f54bf
commit 9218bd8c88
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
email2/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
View File

@ -238,23 +238,6 @@ public class AttachmentUtilities {
return resultType.toLowerCase(); return resultType.toLowerCase();
} }
/**
* @return mime-type for a {@link Uri}.
* - Use {@link ContentResolver#getType} for a content: URI.
* - Use {@link #inferMimeType} for a file: URI.
* - Otherwise throw {@link IllegalArgumentException}.
*/
public static String inferMimeTypeForUri(Context context, Uri uri) {
final String scheme = uri.getScheme();
if ("content".equals(scheme)) {
return context.getContentResolver().getType(uri);
} else if ("file".equals(scheme)) {
return inferMimeType(uri.getLastPathSegment(), "");
} else {
throw new IllegalArgumentException();
}
}
/** /**
* Extract and return filename's extension, converted to lower case, and not including the "." * Extract and return filename's extension, converted to lower case, and not including the "."
* *

5
email2/src/com/android/email/LegacyConversions.java
View File

@ -213,8 +213,11 @@ public class LegacyConversions {
String[] partIds = part.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA); String[] partIds = part.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA);
String partId = partIds != null ? partIds[0] : null; String partId = partIds != null ? partIds[0] : null;
// Run the mime type through inferMimeType in case we have something generic and can do
// better using the filename extension
String mimeType = AttachmentUtilities.inferMimeType(name, part.getMimeType());
localAttachment.mMimeType = mimeType;
localAttachment.mFileName = name; localAttachment.mFileName = name;
localAttachment.mMimeType = part.getMimeType();
localAttachment.mSize = size; // May be reset below if file handled localAttachment.mSize = size; // May be reset below if file handled
localAttachment.mContentId = part.getContentId(); localAttachment.mContentId = part.getContentId();
localAttachment.mContentUri = null; // Will be rewritten by saveAttachmentBody localAttachment.mContentUri = null; // Will be rewritten by saveAttachmentBody