From a36ffb297a947c6a12c82fee6f5218290d416b40 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 4 Mar 2017 22:53:05 +0100 Subject: [PATCH] allow setting a default third party video player --- .../gallery/activities/MediaActivity.kt | 14 ++++++++++---- .../gallery/extensions/activity.kt | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt index 5be201374..6677d1464 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt @@ -330,10 +330,16 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener { } finish() } else { - Intent(this, ViewPagerActivity::class.java).apply { - putExtra(MEDIUM, path) - putExtra(SHOW_ALL, mShowAll) - startActivity(this) + val file = File(path) + val isVideo = file.isVideoFast() + if (isVideo) { + openWith(file, false) + } else { + Intent(this, ViewPagerActivity::class.java).apply { + putExtra(MEDIUM, path) + putExtra(SHOW_ALL, mShowAll) + startActivity(this) + } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt index 742905b43..70c946f91 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt @@ -71,14 +71,14 @@ fun Activity.setAsWallpaper(file: File) { } } -fun Activity.openWith(file: File) { +fun Activity.openWith(file: File, forceChooser: Boolean = true) { val intent = Intent(Intent.ACTION_VIEW) val uri = Uri.fromFile(file) intent.setDataAndType(uri, file.getMimeType("image/jpeg")) val chooser = Intent.createChooser(intent, getString(R.string.open_with)) if (intent.resolveActivity(packageManager) != null) { - startActivity(chooser) + startActivity(if (forceChooser) chooser else intent) } else { toast(R.string.no_app_found) }