Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

info: prevent false positive media results (e.g. JPEG on Galaxy S7)

Browse source
This commit is contained in:
Thibault Deckers 2020-10-28 11:22:57 +09:00
parent 949befe9cc
commit 752749bafe
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
View file

@ -49,6 +49,7 @@ import deckers.thibault.aves.utils.BitmapUtils
import deckers.thibault.aves.utils.LogUtils import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.MimeTypes import deckers.thibault.aves.utils.MimeTypes
import deckers.thibault.aves.utils.MimeTypes.isImage import deckers.thibault.aves.utils.MimeTypes.isImage
import deckers.thibault.aves.utils.MimeTypes.isMultimedia
import deckers.thibault.aves.utils.MimeTypes.isSupportedByMetadataExtractor import deckers.thibault.aves.utils.MimeTypes.isSupportedByMetadataExtractor
import deckers.thibault.aves.utils.MimeTypes.isVideo import deckers.thibault.aves.utils.MimeTypes.isVideo
import deckers.thibault.aves.utils.StorageUtils import deckers.thibault.aves.utils.StorageUtils
@ -150,9 +151,11 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
} }
} }
val mediaDir = getAllMetadataByMediaMetadataRetriever(uri) if (isMultimedia(mimeType)) {
if (mediaDir.isNotEmpty()) { val mediaDir = getAllMetadataByMediaMetadataRetriever(uri)
metadataMap[Metadata.DIR_MEDIA] = mediaDir if (mediaDir.isNotEmpty()) {
metadataMap[Metadata.DIR_MEDIA] = mediaDir
}
} }
if (metadataMap.isNotEmpty()) { if (metadataMap.isNotEmpty()) {

5
android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
View file

@ -30,6 +30,11 @@ object MimeTypes {
fun isVideo(mimeType: String?) = mimeType != null && mimeType.startsWith(VIDEO) fun isVideo(mimeType: String?) = mimeType != null && mimeType.startsWith(VIDEO)
fun isMultimedia(mimeType: String?) = when (mimeType) {
HEIC, HEIF -> true
else -> isVideo(mimeType)
}
// returns whether the specified MIME type represents // returns whether the specified MIME type represents
// a raster image format that allows an alpha channel // a raster image format that allows an alpha channel
fun canHaveAlpha(mimeType: String?) = when (mimeType) { fun canHaveAlpha(mimeType: String?) = when (mimeType) {