mirror of
https://github.com/nextcloud/talk-android
synced 2025-01-18 21:18:15 +00:00
Merge pull request #4553 from nextcloud/use_internal_player
open .webm video files with internal player
This commit is contained in:
commit
79230badc4
@ -42,6 +42,7 @@ import com.nextcloud.talk.utils.Mimetype.TEXT_PLAIN
|
|||||||
import com.nextcloud.talk.utils.Mimetype.VIDEO_MP4
|
import com.nextcloud.talk.utils.Mimetype.VIDEO_MP4
|
||||||
import com.nextcloud.talk.utils.Mimetype.VIDEO_OGG
|
import com.nextcloud.talk.utils.Mimetype.VIDEO_OGG
|
||||||
import com.nextcloud.talk.utils.Mimetype.VIDEO_QUICKTIME
|
import com.nextcloud.talk.utils.Mimetype.VIDEO_QUICKTIME
|
||||||
|
import com.nextcloud.talk.utils.Mimetype.VIDEO_WEBM
|
||||||
import com.nextcloud.talk.utils.MimetypeUtils.isAudioOnly
|
import com.nextcloud.talk.utils.MimetypeUtils.isAudioOnly
|
||||||
import com.nextcloud.talk.utils.MimetypeUtils.isGif
|
import com.nextcloud.talk.utils.MimetypeUtils.isGif
|
||||||
import com.nextcloud.talk.utils.MimetypeUtils.isMarkdown
|
import com.nextcloud.talk.utils.MimetypeUtils.isMarkdown
|
||||||
@ -148,7 +149,8 @@ class FileViewerUtils(private val context: Context, private val user: User) {
|
|||||||
AUDIO_OGG,
|
AUDIO_OGG,
|
||||||
VIDEO_MP4,
|
VIDEO_MP4,
|
||||||
VIDEO_QUICKTIME,
|
VIDEO_QUICKTIME,
|
||||||
VIDEO_OGG
|
VIDEO_OGG,
|
||||||
|
VIDEO_WEBM
|
||||||
-> openMediaView(filename, mimetype)
|
-> openMediaView(filename, mimetype)
|
||||||
IMAGE_PNG,
|
IMAGE_PNG,
|
||||||
IMAGE_JPEG,
|
IMAGE_JPEG,
|
||||||
@ -252,6 +254,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
|
|||||||
VIDEO_MP4,
|
VIDEO_MP4,
|
||||||
VIDEO_QUICKTIME,
|
VIDEO_QUICKTIME,
|
||||||
VIDEO_OGG,
|
VIDEO_OGG,
|
||||||
|
VIDEO_WEBM,
|
||||||
TEXT_MARKDOWN,
|
TEXT_MARKDOWN,
|
||||||
TEXT_PLAIN -> true
|
TEXT_PLAIN -> true
|
||||||
else -> false
|
else -> false
|
||||||
|
@ -26,6 +26,7 @@ object Mimetype {
|
|||||||
const val VIDEO_MP4 = "video/mp4"
|
const val VIDEO_MP4 = "video/mp4"
|
||||||
const val VIDEO_QUICKTIME = "video/quicktime"
|
const val VIDEO_QUICKTIME = "video/quicktime"
|
||||||
const val VIDEO_OGG = "video/ogg"
|
const val VIDEO_OGG = "video/ogg"
|
||||||
|
const val VIDEO_WEBM = "video/webm"
|
||||||
|
|
||||||
const val TEXT_MARKDOWN = "text/markdown"
|
const val TEXT_MARKDOWN = "text/markdown"
|
||||||
const val TEXT_PLAIN = "text/plain"
|
const val TEXT_PLAIN = "text/plain"
|
||||||
|
Loading…
Reference in New Issue
Block a user