Merge pull request #2966 from vitorpamplona/claude/fix-video-mime-type-sqkiz

Fix MediaStore MIME type compatibility for video files

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/MediaSaverToDisk.kt

@@ -205,7 +205,7 @@ object MediaSaverToDisk {
         contentSource: BufferedSource,
         contentResolver: ContentResolver,
     ) {
-        val cleanMimeType = contentType.substringBefore(";").trim()
+        val cleanMimeType = normalizeMimeTypeForMediaStore(contentType.substringBefore(";").trim())
 
         val (masterUri, baseDir) =
             when {
@@ -271,6 +271,15 @@ object MediaSaverToDisk {
 
     private fun trimInlineMetaData(url: String): String = url.substringBefore("#")
 
+    // Android's MediaStore only accepts a fixed allow-list of MIME types.
+    // MimeTypeMap returns variants like video/x-m4v that MediaProvider rejects,
+    // so map them to the closest supported equivalent.
+    internal fun normalizeMimeTypeForMediaStore(mimeType: String): String =
+        when (mimeType.lowercase()) {
+            "video/x-m4v" -> "video/mp4"
+            else -> mimeType
+        }
+
     private const val AMETHYST_SUBDIRECTORY = "Amethyst"
     private const val PDF_MIME_TYPE = "application/pdf"
 }

amethyst/src/test/java/com/vitorpamplona/amethyst/ui/actions/MediaSaverToDiskTest.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.actions
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class MediaSaverToDiskTest {
+    @Test
+    fun normalizesVideoXM4vToVideoMp4() {
+        assertEquals("video/mp4", MediaSaverToDisk.normalizeMimeTypeForMediaStore("video/x-m4v"))
+    }
+
+    @Test
+    fun normalizationIsCaseInsensitive() {
+        assertEquals("video/mp4", MediaSaverToDisk.normalizeMimeTypeForMediaStore("Video/X-M4V"))
+    }
+
+    @Test
+    fun passesThroughSupportedVideoTypes() {
+        assertEquals("video/mp4", MediaSaverToDisk.normalizeMimeTypeForMediaStore("video/mp4"))
+        assertEquals("video/webm", MediaSaverToDisk.normalizeMimeTypeForMediaStore("video/webm"))
+        assertEquals("video/quicktime", MediaSaverToDisk.normalizeMimeTypeForMediaStore("video/quicktime"))
+    }
+
+    @Test
+    fun passesThroughImageAndAudioTypes() {
+        assertEquals("image/jpeg", MediaSaverToDisk.normalizeMimeTypeForMediaStore("image/jpeg"))
+        assertEquals("image/png", MediaSaverToDisk.normalizeMimeTypeForMediaStore("image/png"))
+        assertEquals("audio/mpeg", MediaSaverToDisk.normalizeMimeTypeForMediaStore("audio/mpeg"))
+    }
+}