Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add fix for m4a mapping to audio/mpeg.

Browse Source
This commit is contained in:
Clark
2023-04-03 09:58:09 -04:00
committed by Alex Hart
parent f9548dcffe
commit 83b0963533
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
View File

@@ -48,7 +48,9 @@ class ShareRepository(context: Context) {
}
val uri = multiShareExternal.uri
val mimeType = getMimeType(appContext, uri, multiShareExternal.mimeType)
val size = getSize(appContext, uri)
val name = getFileName(appContext, uri)
val mimeType = getMimeType(appContext, uri, multiShareExternal.mimeType, name?.substringAfterLast('.', ""))
val stream: InputStream = try {
appContext.contentResolver.openInputStream(uri)
@@ -57,9 +59,6 @@ class ShareRepository(context: Context) {
null
} ?: return ResolvedShareData.Failure
val size = getSize(appContext, uri)
val name = getFileName(appContext, uri)
val blobUri: Uri = try {
BlobProvider.getInstance()
.forData(stream, size)
@@ -142,8 +141,8 @@ class ShareRepository(context: Context) {
companion object {
private val TAG = Log.tag(ShareRepository::class.java)
private fun getMimeType(context: Context, uri: Uri, mimeType: String?): String {
var updatedMimeType = MediaUtil.getMimeType(context, uri)
private fun getMimeType(context: Context, uri: Uri, mimeType: String?, fileExtension: String? = null): String {
var updatedMimeType = MediaUtil.getMimeType(context, uri, fileExtension)
if (updatedMimeType == null) {
updatedMimeType = MediaUtil.getCorrectedMimeType(mimeType)
}