diff options
author | Taesu Lee <taesu82.lee@samsung.com> | 2020-02-05 13:06:34 +0900 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:29:45 +0100 |
commit | ac0b2bfce404d2341e8266dbad462ba6745af94e (patch) | |
tree | 6aa0e694a33f86e629fb68bb9fab38f9a9fa468d | |
parent | e853209938ee8144a5dd0dceb636f5c7438e8d29 (diff) | |
download | android_packages_apps_Messaging-ac0b2bfce404d2341e8266dbad462ba6745af94e.tar.gz android_packages_apps_Messaging-ac0b2bfce404d2341e8266dbad462ba6745af94e.tar.bz2 android_packages_apps_Messaging-ac0b2bfce404d2341e8266dbad462ba6745af94e.zip |
Allow acceptable media types only for sharing
Test: Manual
Change-Id: I20d5f8abf2ba7b7b620aa2a4ec1e0a43091f98c2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
-rw-r--r-- | src/com/android/messaging/datamodel/data/MessagePartData.java | 5 | ||||
-rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/messaging/datamodel/data/MessagePartData.java b/src/com/android/messaging/datamodel/data/MessagePartData.java index fffaca8..d1f5c9d 100644 --- a/src/com/android/messaging/datamodel/data/MessagePartData.java +++ b/src/com/android/messaging/datamodel/data/MessagePartData.java @@ -328,6 +328,11 @@ public class MessagePartData implements Parcelable { return mHeight; } + public static boolean isSupportedMediaType(final String contentType) { + return ContentType.isVCardType(contentType) + || Arrays.asList(ACCEPTABLE_GALLERY_MEDIA_TYPES).contains(contentType); + } + /** * * @return true if this part can only exist by itself, with no other attachments diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index 25d5ea3..412177e 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -103,7 +103,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements } mDraftMessage = sharedText != null ? MessageData.createSharedMessage(sharedText) : null; - } else if (ContentType.isMediaType(contentType)) { + } else if (PendingAttachmentData.isSupportedMediaType(contentType)) { if (contentUri != null) { mDraftMessage = MessageData.createSharedMessage(null); addSharedPartToDraft(contentType, contentUri); @@ -139,7 +139,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements } strBuffer.append(sharedText); } - } else if (ContentType.isMediaType(actualContentType)) { + } else if (PendingAttachmentData.isSupportedMediaType(actualContentType)) { uriMap.put(uri, actualContentType); } else { // Unsupported content type. |