highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-13 23:17:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1300 from davotoula/sniff-content-type-from-extension-when-empty-in-response-headers

Browse Source 
Sniff content type from extension when empty in response headers
This commit is contained in:
Vitor Pamplona
2025-03-24 17:50:22 -04:00
committed by GitHub
parent ef582eceb6 cdf2b10fd2
commit d2c19cbbb4
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,25 +55,25 @@ object MediaSaverToDisk {
onSuccess: () -> Any?,
onError: (Throwable) -> Any?,
) {
videoUri?.let { theVideoUri ->
if (!theVideoUri.startsWith("file")) {
downloadAndSave(
url = theVideoUri,
mimeType = mimeType,
context = localContext,
forceProxy = forceProxy,
onSuccess = onSuccess,
onError = onError,
)
} else {
when {
videoUri.isNullOrBlank() -> return
videoUri.startsWith("file") ->
save(
localFile = theVideoUri.toUri().toFile(),
localFile = videoUri.toUri().toFile(),
mimeType = mimeType,
context = localContext,
onSuccess = onSuccess,
onError = onError,
)
}
else ->
downloadAndSave(
url = videoUri,
mimeType = mimeType,
forceProxy = forceProxy,
context = localContext,
onSuccess = onSuccess,
onError = onError,
)
}
}
@@ -120,8 +120,8 @@ object MediaSaverToDisk {
check(response.isSuccessful)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
val contentType = response.header("Content-Type")
checkNotNull(contentType) { "Can't find out the content type" }
val contentType = response.header("Content-Type") ?: getMimeTypeFromExtension(trimInlineMetaData(url))
check(contentType.isNotBlank()) { "Can't find out the content type" }
val realType =
if (contentType == "application/octet-stream") {
@@ -240,11 +240,9 @@ object MediaSaverToDisk {
File(
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
PICTURES_SUBDIRECTORY,
)
if (!subdirectory.exists()) {
subdirectory.mkdirs()
}
).apply {
if (!exists()) mkdirs()
}
val outputFile = File(subdirectory, fileName)