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

am 04cf5e4b: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb

Browse Source 
* commit '04cf5e4bdf091f490f2e3bfb40f80bab44a05e25':
  AttachmentProvider: Always return mime-types in lowercase
This commit is contained in:
Makoto Onuki 2011-01-23 11:38:28 -08:00 committed by Android Git Automerger
commit 2aee3a1002
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/android/email/provider/AttachmentProvider.java
View File

@ -196,31 +196,39 @@ public class AttachmentProvider extends ContentProvider {
* @param mimeType The given mime type * @param mimeType The given mime type
* @return A likely mime type for the attachment * @return A likely mime type for the attachment
*/ */
public static String inferMimeType(String fileName, String mimeType) { public static String inferMimeType(final String fileName, final String mimeType) {
if (fileName != null && fileName.toLowerCase().endsWith(".eml")) {
return "message/rfc822";
}
// If the given mime type appears to be non-empty and non-generic - return it
if (!TextUtils.isEmpty(mimeType) &&
!"application/octet-stream".equalsIgnoreCase(mimeType)) {
return mimeType;
}
// Try to find an extension in the filename // NOTE mime-types are case-*sensitive* on Android.
if (!TextUtils.isEmpty(fileName)) { // Return values from this method MUST always in lowercase.
String extension = getFilenameExtension(fileName); String result = null;
if (!TextUtils.isEmpty(extension)) {
// Extension found. Look up mime type, or synthesize if none found. if (fileName != null && fileName.toLowerCase().endsWith(".eml")) {
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); result = "message/rfc822";
if (mimeType == null) { } else {
mimeType = "application/" + extension; // If the given mime type appears to be non-empty and non-generic - return it
if (!TextUtils.isEmpty(mimeType) &&
!"application/octet-stream".equalsIgnoreCase(mimeType)) {
result = mimeType;
} else {
// Try to find an extension in the filename
if (!TextUtils.isEmpty(fileName)) {
String extension = getFilenameExtension(fileName);
if (!TextUtils.isEmpty(extension)) {
// Extension found. Look up mime type, or synthesize if none found.
result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
if (TextUtils.isEmpty(result)) {
result = "application/" + extension;
}
}
} }
return mimeType;
} }
} }
// Fallback case - no good guess could be made. if (TextUtils.isEmpty(result)) {
return "application/octet-stream"; // Fallback case - no good guess could be made.
result = "application/octet-stream";
}
return result.toLowerCase();
} }
/** /**

33
tests/src/com/android/email/provider/AttachmentProviderTests.java
View File

@ -277,39 +277,42 @@ public class AttachmentProviderTests extends ProviderTestCase2<AttachmentProvide
* If the filename has a recognizable extension and it converts to a mime type, return that. * If the filename has a recognizable extension and it converts to a mime type, return that.
* If the filename has an unrecognized extension, return "application/extension" * If the filename has an unrecognized extension, return "application/extension"
* Otherwise return "application/octet-stream". * Otherwise return "application/octet-stream".
*
* Also, all results should be in lowercase.
*/ */
public void testInferMimeType() { public void testInferMimeType() {
final String DEFAULT = "application/octet-stream"; final String DEFAULT_MIX = "Application/Octet-stream";
final String FILE_PDF = "myfile.false.pdf"; final String DEFAULT_LOWER = DEFAULT_MIX.toLowerCase();
final String FILE_ABC = "myfile.false.abc"; final String FILE_PDF = "myfile.false.pDf";
final String FILE_ABC = "myfile.false.aBc";
final String FILE_NO_EXT = "myfile"; final String FILE_NO_EXT = "myfile";
// If the given mime type is non-empty and anything other than "application/octet-stream", // If the given mime type is non-empty and anything other than "application/octet-stream",
// just return it. (This is the most common case.) // just return it. (This is the most common case.)
assertEquals("mime/type", AttachmentProvider.inferMimeType(null, "mime/type")); assertEquals("mime/type", AttachmentProvider.inferMimeType(null, "Mime/TyPe"));
assertEquals("mime/type", AttachmentProvider.inferMimeType("", "mime/type")); assertEquals("mime/type", AttachmentProvider.inferMimeType("", "Mime/TyPe"));
assertEquals("mime/type", AttachmentProvider.inferMimeType(FILE_PDF, "mime/type")); assertEquals("mime/type", AttachmentProvider.inferMimeType(FILE_PDF, "Mime/TyPe"));
// If the filename has a recognizable extension and it converts to a mime type, return that. // If the filename has a recognizable extension and it converts to a mime type, return that.
assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, null)); assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, null));
assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, "")); assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, ""));
assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, DEFAULT)); assertEquals("application/pdf", AttachmentProvider.inferMimeType(FILE_PDF, DEFAULT_MIX));
// If the filename has an unrecognized extension, return "application/extension" // If the filename has an unrecognized extension, return "application/extension"
assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, null)); assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, null));
assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, "")); assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, ""));
assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, DEFAULT)); assertEquals("application/abc", AttachmentProvider.inferMimeType(FILE_ABC, DEFAULT_MIX));
// Otherwise return "application/octet-stream". // Otherwise return "application/octet-stream".
assertEquals(DEFAULT, AttachmentProvider.inferMimeType(FILE_NO_EXT, null)); assertEquals(DEFAULT_LOWER, AttachmentProvider.inferMimeType(FILE_NO_EXT, null));
assertEquals(DEFAULT, AttachmentProvider.inferMimeType(FILE_NO_EXT, "")); assertEquals(DEFAULT_LOWER, AttachmentProvider.inferMimeType(FILE_NO_EXT, ""));
assertEquals(DEFAULT, AttachmentProvider.inferMimeType(FILE_NO_EXT, DEFAULT)); assertEquals(DEFAULT_LOWER, AttachmentProvider.inferMimeType(FILE_NO_EXT, DEFAULT_MIX));
assertEquals(DEFAULT, AttachmentProvider.inferMimeType(null, null)); assertEquals(DEFAULT_LOWER, AttachmentProvider.inferMimeType(null, null));
assertEquals(DEFAULT, AttachmentProvider.inferMimeType("", "")); assertEquals(DEFAULT_LOWER, AttachmentProvider.inferMimeType("", ""));
// Test for eml files. // Test for eml files.
assertEquals("message/rfc822", AttachmentProvider.inferMimeType("a.eMl", "text/plain")); assertEquals("message/rfc822", AttachmentProvider.inferMimeType("a.eMl", "Text/Plain"));
assertEquals("message/rfc822", AttachmentProvider.inferMimeType("a.eml", DEFAULT)); assertEquals("message/rfc822", AttachmentProvider.inferMimeType("a.eml", DEFAULT_MIX));
} }
/** /**