filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating the known SDK mimetypes and making use of them for the intent switches

This commit is contained in:
Adam Brown 2022-07-06 12:06:17 +01:00
parent 59ef8e10c8
commit 169ac9d0a0
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,15 @@ object MimeTypes {
const val Ogg = "audio/ogg" const val Ogg = "audio/ogg"
const val PlainText = "text/plain"
fun String?.normalizeMimeType() = if (this == BadJpg) Jpeg else this fun String?.normalizeMimeType() = if (this == BadJpg) Jpeg else this
fun String?.isMimeTypeImage() = this?.startsWith("image/").orFalse() fun String?.isMimeTypeImage() = this?.startsWith("image/").orFalse()
fun String?.isMimeTypeVideo() = this?.startsWith("video/").orFalse() fun String?.isMimeTypeVideo() = this?.startsWith("video/").orFalse()
fun String?.isMimeTypeAudio() = this?.startsWith("audio/").orFalse() fun String?.isMimeTypeAudio() = this?.startsWith("audio/").orFalse()
fun String?.isMimeTypeApplication() = this?.startsWith("application/").orFalse()
fun String?.isMimeTypeFile() = this?.startsWith("file/").orFalse()
fun String?.isMimeTypeText() = this?.startsWith("text/").orFalse()
fun String?.isMimeTypeAny() = this?.startsWith("*/").orFalse()
} }

18
vector/src/main/java/im/vector/app/features/attachments/ShareIntentHandler.kt
View File

@ -19,6 +19,14 @@ package im.vector.app.features.attachments
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import org.matrix.android.sdk.api.session.content.ContentAttachmentData import org.matrix.android.sdk.api.session.content.ContentAttachmentData
import org.matrix.android.sdk.api.util.MimeTypes
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeAny
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeApplication
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeAudio
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeFile
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeImage
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeText
import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeVideo
import javax.inject.Inject import javax.inject.Inject
class ShareIntentHandler @Inject constructor( class ShareIntentHandler @Inject constructor(
@ -34,11 +42,11 @@ class ShareIntentHandler @Inject constructor(
fun handleIncomingShareIntent(intent: Intent, onFile: (List<ContentAttachmentData>) -> Unit, onPlainText: (String) -> Unit): Boolean { fun handleIncomingShareIntent(intent: Intent, onFile: (List<ContentAttachmentData>) -> Unit, onPlainText: (String) -> Unit): Boolean {
val type = intent.resolveType(context) ?: return false val type = intent.resolveType(context) ?: return false
return when { return when {
type == "text/plain" -> handlePlainText(intent, onPlainText) type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
type.startsWith("image") -> onFile(multiPickerIncomingFiles.image(intent)).let { true } type.isMimeTypeImage() -> onFile(multiPickerIncomingFiles.image(intent)).let { true }
type.startsWith("video") -> onFile(multiPickerIncomingFiles.video(intent)).let { true } type.isMimeTypeVideo() -> onFile(multiPickerIncomingFiles.video(intent)).let { true }
type.startsWith("audio") -> onFile(multiPickerIncomingFiles.audio(intent)).let { true } type.isMimeTypeAudio() -> onFile(multiPickerIncomingFiles.audio(intent)).let { true }
type.startsWith("application") || type.startsWith("file") || type.startsWith("text") || type.startsWith("*") -> { type.isMimeTypeApplication() || type.isMimeTypeFile() || type.isMimeTypeText() || type.isMimeTypeAny() -> {
onFile(multiPickerIncomingFiles.file(intent)).let { true } onFile(multiPickerIncomingFiles.file(intent)).let { true }
} }
else -> false else -> false