Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit cc9fd6b

Browse files
authored
Merge pull request #1666 from wordpress-mobile/add-missing-mime-type
Add missing "video/x-msvideo" mime type
2 parents a749ee4 + 6820d2c commit cc9fd6b

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

example/src/test/java/org/wordpress/android/fluxc/utils/MimeTypesTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class MimeTypesTest {
2424
"video/quicktime",
2525
"video/x-ms-wmv",
2626
"video/avi",
27+
"video/x-msvideo",
28+
"video/msvideo",
2729
"video/mpeg",
2830
"video/mp2p",
2931
"video/ogg",

fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeType.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ data class MimeType(val type: Type, val subtypes: List<Subtype>, val extensions:
2222
QUICKTIME("quicktime"),
2323
X_MS_WMV("x-ms-wmv"),
2424
AVI("avi"),
25+
X_MSVIDEO("x-msvideo"),
26+
MSVIDEO("msvideo"),
2527
MP2P("mp2p"),
2628
THREE_GPP("3gpp"),
2729
THREE_GPP_2("3gpp2"),

fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeTypes.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MimeTypes {
3131
* .mp4, .m4v (MPEG-4) - "video/mp4"
3232
* .mov - missing - using "video/quicktime"
3333
* .wmv - "video/x-ms-wmv"
34-
* .avi - "video/avi"
34+
* .avi - "video/avi", "video/x-msvideo", "video/msvideo"
3535
* .mpg - "video/mpeg", "video/mp2p"
3636
* .ogv (Ogg) - missing - using "video/ogg"
3737
* .3gp (3GPP) - "video/3gpp"
@@ -42,6 +42,8 @@ class MimeTypes {
4242
MimeType(VIDEO, Subtype.QUICKTIME, listOf("mov")),
4343
MimeType(VIDEO, Subtype.X_MS_WMV, listOf("wmv")),
4444
MimeType(VIDEO, Subtype.AVI, listOf("avi")),
45+
MimeType(VIDEO, Subtype.X_MSVIDEO, listOf("avi")),
46+
MimeType(VIDEO, Subtype.MSVIDEO, listOf("avi")),
4547
MimeType(VIDEO, Subtype.MPEG, listOf("mpg")),
4648
MimeType(VIDEO, Subtype.MP2P, listOf("mpg")),
4749
MimeType(VIDEO, Subtype.OGG, listOf("ogv")),

0 commit comments

Comments
 (0)