Skip to content
Snippets Groups Projects
Commit 505f307d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Allow acceptable media types only for sharing am: a8b76eaf

Change-Id: If336f625c4dc344fba9fd39387b915e1fe1e24a4
parents 3359f4de a8b76eaf
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment