Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue on Android 21

Browse Source
This commit is contained in:
Benoit Marty 2021-07-15 17:30:48 +02:00
parent bfc70be5bb
commit 343ea42ef5
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt
View File

@ -31,6 +31,8 @@ object MimeTypes {
const val Jpeg = "image/jpeg"
const val Gif = "image/gif"
const val Ogg = "audio/ogg"
fun String?.normalizeMimeType() = if (this == BadJpg) Jpeg else this
fun String?.isMimeTypeImage() = this?.startsWith("image/").orFalse()

10
multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
View File

@ -141,7 +141,7 @@ fun Uri.toMultiPickerAudioType(context: Context): MultiPickerAudioType? {
MultiPickerAudioType(
name,
size,
context.contentResolver.getType(this),
sanitize(context.contentResolver.getType(this)),
this,
duration
)
@ -150,3 +150,11 @@ fun Uri.toMultiPickerAudioType(context: Context): MultiPickerAudioType? {
}
}
}
private fun sanitize(type: String?): String? {
if (type == "application/ogg") {
// Not supported on old system
return "audio/ogg"
}
return type
}

1
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt
View File

@ -74,7 +74,6 @@ class VoiceMessageHelper @Inject constructor(
voiceRecorder.getVoiceMessageFile()
}
try {
// TODO Improve this
voiceMessageFile?.let {
val outputFileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", it)
return outputFileUri