filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow acceptable media types only for sharing

Browse Source 
Test: Manual

Change-Id: I20d5f8abf2ba7b7b620aa2a4ec1e0a43091f98c2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
This commit is contained in:
Taesu Lee
2020-02-05 13:06:34 +09:00
parent 2716c26c23
commit a8b76eafc4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/messaging/datamodel/data/MessagePartData.java
View File

@@ -341,6 +341,11 @@ public class MessagePartData implements Parcelable {
return mHeight; 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 * @return true if this part can only exist by itself, with no other attachments

4
src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
View File

@@ -103,7 +103,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
} }
mDraftMessage = mDraftMessage =
sharedText != null ? MessageData.createSharedMessage(sharedText) : null; sharedText != null ? MessageData.createSharedMessage(sharedText) : null;
} else if (ContentType.isMediaType(contentType)) { } else if (PendingAttachmentData.isSupportedMediaType(contentType)) {
if (contentUri != null) { if (contentUri != null) {
mDraftMessage = MessageData.createSharedMessage(null); mDraftMessage = MessageData.createSharedMessage(null);
addSharedPartToDraft(contentType, contentUri); addSharedPartToDraft(contentType, contentUri);
@@ -139,7 +139,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
} }
strBuffer.append(sharedText); strBuffer.append(sharedText);
} }
} else if (ContentType.isMediaType(actualContentType)) { } else if (PendingAttachmentData.isSupportedMediaType(actualContentType)) {
uriMap.put(uri, actualContentType); uriMap.put(uri, actualContentType);
} else { } else {
// Unsupported content type. // Unsupported content type.