Mastodon/pachli-android
1
0
Fork 0
mirror of https://github.com/pachli/pachli-android.git synced 2025-02-09 00:18:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sniff MIME type for audio/video files before upload (#3190)

Browse Source 
MIME type detection for files based on extensions (the `getType()` method)
returns incorrect results from DownloadProvider and FileProvider for (at
least) .m4a files.

Investigation details are in https://github.com/tuskyapp/Tusky/issues/3189

Be safe, and use `MediaMetadataRetriever` to sniff the content of the files
to determine the correct type.

Fixes https://github.com/tuskyapp/Tusky/issues/3189
This commit is contained in:
Nik Clayton 2023-01-21 14:54:40 +01:00 committed by GitHub
parent db91b4db0e
commit b8f4de9922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
View File

@ -17,6 +17,8 @@ package com.keylesspalace.tusky.components.compose
import android.content.ContentResolver import android.content.ContentResolver
import android.content.Context import android.content.Context
import android.media.MediaMetadataRetriever
import android.media.MediaMetadataRetriever.METADATA_KEY_MIMETYPE
import android.net.Uri import android.net.Uri
import android.os.Environment import android.os.Environment
import android.util.Log import android.util.Log
@ -248,6 +250,19 @@ class MediaUploader @Inject constructor(
private suspend fun upload(media: QueuedMedia): Flow<UploadEvent> { private suspend fun upload(media: QueuedMedia): Flow<UploadEvent> {
return callbackFlow { return callbackFlow {
var mimeType = contentResolver.getType(media.uri) var mimeType = contentResolver.getType(media.uri)
// Android's MIME type suggestions from file extensions is broken for at least
// .m4a files. See https://github.com/tuskyapp/Tusky/issues/3189 for details.
// Sniff the content of the file to determine the actual type.
if (mimeType != null && (
mimeType.startsWith("audio/", ignoreCase = true) ||
mimeType.startsWith("video/", ignoreCase = true)
)
) {
val retriever = MediaMetadataRetriever()
retriever.setDataSource(context, media.uri)
mimeType = retriever.extractMetadata(METADATA_KEY_MIMETYPE)
}
val map = MimeTypeMap.getSingleton() val map = MimeTypeMap.getSingleton()
val fileExtension = map.getExtensionFromMimeType(mimeType) val fileExtension = map.getExtensionFromMimeType(mimeType)
val filename = "%s_%s_%s.%s".format( val filename = "%s_%s_%s.%s".format(