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 am: a8b76eafc4 am: 505f307d1b am: 7c546bf0f3

Browse Source 
Change-Id: I5b546d287543a3e8264e244a797a226c27330d50
This commit is contained in:
Automerger Merge Worker
2020-02-20 00:50:30 +00:00
parent eaea47c149 7c546bf0f3
commit cd5e0e37c1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/data/MessagePartData.java
+5
View File
@@ -341,6 +341,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
src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+2 -2
View File
@@ -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.