From a0c399e2cfa05ee6534749d35a26a88d582f5cbe Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 12 Dec 2018 18:56:42 +0100 Subject: [PATCH] fix crash in MediaUtils.getVideoThumbnail --- .../java/com/keylesspalace/tusky/util/MediaUtils.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt index 10d7ca7bc..951132bde 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt @@ -113,7 +113,15 @@ fun getImageThumbnail(contentResolver: ContentResolver, uri: Uri, @Px thumbnailS fun getVideoThumbnail(context: Context, uri: Uri, @Px thumbnailSize: Int): Bitmap? { val retriever = MediaMetadataRetriever() - retriever.setDataSource(context, uri) + try { + retriever.setDataSource(context, uri) + } catch (e: IllegalArgumentException) { + Log.w(TAG, e) + return null + } catch (e: SecurityException) { + Log.w(TAG, e) + return null + } val source = retriever.frameAtTime ?: return null return ThumbnailUtils.extractThumbnail(source, thumbnailSize, thumbnailSize, ThumbnailUtils.OPTIONS_RECYCLE_INPUT) }