Skip to content

Commit 63cefda

Browse files
wmontwewmontwe
authored
Merge pull request thunderbird#8048 from Mino260806/fix_incorrect_mimetype
fix incorrect mimetype inferrence
2 parents 666d622 + 2264fff commit 63cefda

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

‎legacy/core/src/main/java/com/fsck/k9/helper/MimeTypeUtil.java

+17-15
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
public class MimeTypeUtil {
1010
public static final String DEFAULT_ATTACHMENT_MIME_TYPE = "application/octet-stream";
11+
public static final String PLAIN_TEXT_MIME_TYPE = "text/plain";
1112
public static final String K9_SETTINGS_MIME_TYPE = "application/x-k9settings";
1213

1314
/*
@@ -19,7 +20,7 @@ public class MimeTypeUtil {
1920
//* Do not delete the next three lines
2021
{ "", DEFAULT_ATTACHMENT_MIME_TYPE },
2122
{ "k9s", K9_SETTINGS_MIME_TYPE },
22-
{ "txt", "text/plain" },
23+
{ "txt", PLAIN_TEXT_MIME_TYPE },
2324
//* Do not delete the previous three lines
2425
{ "123", "application/vnd.lotus-1-2-3" },
2526
{ "323", "text/h323" },
@@ -68,7 +69,7 @@ public class MimeTypeUtil {
6869
{ "azf", "application/vnd.airzip.filesecure.azf" },
6970
{ "azs", "application/vnd.airzip.filesecure.azs" },
7071
{ "azw", "application/vnd.amazon.ebook" },
71-
{ "bas", "text/plain" },
72+
{ "bas", PLAIN_TEXT_MIME_TYPE },
7273
{ "bat", "application/x-msdownload" },
7374
{ "bcpio", "application/x-bcpio" },
7475
{ "bdf", "application/x-font-bdf" },
@@ -123,7 +124,7 @@ public class MimeTypeUtil {
123124
{ "cmx", "image/x-cmx" },
124125
{ "cod", "application/vnd.rim.cod" },
125126
{ "com", "application/x-msdownload" },
126-
{ "conf", "text/plain" },
127+
{ "conf", PLAIN_TEXT_MIME_TYPE },
127128
{ "cpio", "application/x-cpio" },
128129
{ "cpp", "text/x-c" },
129130
{ "cpt", "application/mac-compactpro" },
@@ -136,7 +137,7 @@ public class MimeTypeUtil {
136137
{ "css", "text/css" },
137138
{ "cst", "application/x-director" },
138139
{ "csv", "text/csv" },
139-
{ "c", "text/plain" },
140+
{ "c", PLAIN_TEXT_MIME_TYPE },
140141
{ "cu", "application/cu-seeme" },
141142
{ "curl", "text/vnd.curl" },
142143
{ "cww", "application/prs.cww" },
@@ -150,12 +151,12 @@ public class MimeTypeUtil {
150151
{ "dd2", "application/vnd.oma.dd2+xml" },
151152
{ "ddd", "application/vnd.fujixerox.ddd" },
152153
{ "deb", "application/x-debian-package" },
153-
{ "def", "text/plain" },
154+
{ "def", PLAIN_TEXT_MIME_TYPE },
154155
{ "deploy", "application/octet-stream" },
155156
{ "der", "application/x-x509-ca-cert" },
156157
{ "dfac", "application/vnd.dreamfactory" },
157158
{ "dic", "text/x-c" },
158-
{ "diff", "text/plain" },
159+
{ "diff", PLAIN_TEXT_MIME_TYPE },
159160
{ "dir", "application/x-director" },
160161
{ "dis", "application/vnd.mobius.dis" },
161162
{ "dist", "application/octet-stream" },
@@ -284,7 +285,7 @@ public class MimeTypeUtil {
284285
{ "hqx", "application/mac-binhex40" },
285286
{ "hta", "application/hta" },
286287
{ "htc", "text/x-component" },
287-
{ "h", "text/plain" },
288+
{ "h", PLAIN_TEXT_MIME_TYPE },
288289
{ "htke", "application/vnd.kenameaapp" },
289290
{ "html", "text/html" },
290291
{ "htm", "text/html" },
@@ -309,7 +310,7 @@ public class MimeTypeUtil {
309310
{ "imp", "application/vnd.accpac.simply.imp" },
310311
{ "ims", "application/vnd.ms-ims" },
311312
{ "ins", "application/x-internet-signup" },
312-
{ "in", "text/plain" },
313+
{ "in", PLAIN_TEXT_MIME_TYPE },
313314
{ "ipk", "application/vnd.shana.informed.package" },
314315
{ "irm", "application/vnd.ibm.rights-management" },
315316
{ "irp", "application/vnd.irepository.package+xml" },
@@ -347,7 +348,7 @@ public class MimeTypeUtil {
347348
{ "kon", "application/vnd.kde.kontour" },
348349
{ "kpr", "application/vnd.kde.kpresenter" },
349350
{ "kpt", "application/vnd.kde.kpresenter" },
350-
{ "ksh", "text/plain" },
351+
{ "ksh", PLAIN_TEXT_MIME_TYPE },
351352
{ "ksp", "application/vnd.kde.kspread" },
352353
{ "ktr", "application/vnd.kahootz" },
353354
{ "ktz", "application/vnd.kahootz" },
@@ -361,8 +362,8 @@ public class MimeTypeUtil {
361362
{ "link66", "application/vnd.route66.link66+xml" },
362363
{ "list3820", "application/vnd.ibm.modcap" },
363364
{ "listafp", "application/vnd.ibm.modcap" },
364-
{ "list", "text/plain" },
365-
{ "log", "text/plain" },
365+
{ "list", PLAIN_TEXT_MIME_TYPE },
366+
{ "log", PLAIN_TEXT_MIME_TYPE },
366367
{ "lostxml", "application/lost+xml" },
367368
{ "lrf", "application/octet-stream" },
368369
{ "lrm", "application/vnd.ms-lrm" },
@@ -542,7 +543,7 @@ public class MimeTypeUtil {
542543
{ "plc", "application/vnd.mobius.plc" },
543544
{ "plf", "application/vnd.pocketlearn" },
544545
{ "pls", "application/pls+xml" },
545-
{ "pl", "text/plain" },
546+
{ "pl", PLAIN_TEXT_MIME_TYPE },
546547
{ "pma", "application/x-perfmon" },
547548
{ "pmc", "application/x-perfmon" },
548549
{ "pml", "application/x-perfmon" },
@@ -727,7 +728,7 @@ public class MimeTypeUtil {
727728
{ "tex", "application/x-tex" },
728729
{ "texi", "application/x-texinfo" },
729730
{ "texinfo", "application/x-texinfo" },
730-
{ "text", "text/plain" },
731+
{ "text", PLAIN_TEXT_MIME_TYPE },
731732
{ "tfm", "application/x-tex-tfm" },
732733
{ "tgz", "application/x-gzip" },
733734
{ "tiff", "image/tiff" },
@@ -746,7 +747,7 @@ public class MimeTypeUtil {
746747
{ "twds", "application/vnd.simtech-mindmapper" },
747748
{ "txd", "application/vnd.genomatix.tuxedo" },
748749
{ "txf", "application/vnd.mobius.txf" },
749-
{ "txt", "text/plain" },
750+
{ "txt", PLAIN_TEXT_MIME_TYPE },
750751
{ "u32", "application/x-authorware-bin" },
751752
{ "udeb", "application/x-debian-package" },
752753
{ "ufd", "application/vnd.ufdl" },
@@ -872,7 +873,8 @@ public class MimeTypeUtil {
872873
};
873874

874875
public static boolean isDefaultMimeType(String mimeType) {
875-
return isSameMimeType(mimeType, DEFAULT_ATTACHMENT_MIME_TYPE);
876+
return isSameMimeType(mimeType, DEFAULT_ATTACHMENT_MIME_TYPE) ||
877+
isSameMimeType(mimeType, PLAIN_TEXT_MIME_TYPE);
876878
}
877879

878880
public static String getMimeTypeByExtension(String filename) {

0 commit comments

Comments
 (0)