From c08199659b561d784490fd7cb8297ab575197f57 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 20 May 2021 13:25:08 -0400 Subject: [PATCH] Support pasting of images into input text. --- .../securesms/util/MediaUtil.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 437e988e20..8b834b701e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -283,15 +283,30 @@ public class MediaUtil { } public static boolean isImageType(String contentType) { - return (null != contentType) && contentType.startsWith("image/"); + if (contentType == null) { + return false; + } + + return contentType.startsWith("image/") || + contentType.equals(MediaStore.Images.Media.CONTENT_TYPE); } public static boolean isAudioType(String contentType) { - return (null != contentType) && contentType.startsWith("audio/"); + if (contentType == null) { + return false; + } + + return contentType.startsWith("audio/") || + contentType.equals(MediaStore.Audio.Media.CONTENT_TYPE); } public static boolean isVideoType(String contentType) { - return (null != contentType) && contentType.startsWith("video/"); + if (contentType == null) { + return false; + } + + return contentType.startsWith("video/") || + contentType.equals(MediaStore.Video.Media.CONTENT_TYPE); } public static boolean isImageOrVideoType(String contentType) {