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

Allow intent shared subject or title to be mms subject

Browse Source 
Test: m, manual
Change-Id: Ibb5eba030320467774cdac1d502ec36c98abcb43
This commit is contained in:
Marco Sirabella
2020-02-22 02:41:01 +00:00
committed by Luca Stefani
parent a8b76eafc4
commit c5cb15c9d8
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/data/MessageData.java
+3 -1
View File
@@ -297,9 +297,11 @@ public class MessageData implements Parcelable {
/**
* Create a message not yet associated with a particular conversation
*/
public static MessageData createSharedMessage(final String messageText) {
public static MessageData createSharedMessage(final String messageText,
final String subjectText) {
final MessageData message = new MessageData();
message.mStatus = BUGLE_STATUS_OUTGOING_DRAFT;
message.mMmsSubject = subjectText;
if (!TextUtils.isEmpty(messageText)) {
message.mParts.add(MessagePartData.createTextMessagePart(messageText));
}
src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+14 -4
View File
@@ -81,6 +81,12 @@ public class ShareIntentActivity extends BaseBugleActivity implements
public void onAttachFragment(final Fragment fragment) {
final Intent intent = getIntent();
final String action = intent.getAction();
String sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
if (sharedSubject == null) {
sharedSubject = intent.getStringExtra(Intent.EXTRA_TITLE);
}
if (Intent.ACTION_SEND.equals(action)) {
final Uri contentUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
if (UriUtil.isFileUri(contentUri)) {
@@ -101,11 +107,14 @@ public class ShareIntentActivity extends BaseBugleActivity implements
// Try to get text string from content uri.
sharedText = getTextStringFromContentUri(contentUri);
}
mDraftMessage =
sharedText != null ? MessageData.createSharedMessage(sharedText) : null;
if (sharedText != null) {
mDraftMessage = MessageData.createSharedMessage(sharedText, sharedSubject);
} else {
mDraftMessage = null;
}
} else if (PendingAttachmentData.isSupportedMediaType(contentType)) {
if (contentUri != null) {
mDraftMessage = MessageData.createSharedMessage(null);
mDraftMessage = MessageData.createSharedMessage(null, sharedSubject);
addSharedPartToDraft(contentType, contentUri);
} else {
mDraftMessage = null;
@@ -149,7 +158,8 @@ public class ShareIntentActivity extends BaseBugleActivity implements
}
if (strBuffer.length() > 0 || !uriMap.isEmpty()) {
mDraftMessage = MessageData.createSharedMessage(strBuffer.toString());
mDraftMessage =
MessageData.createSharedMessage(strBuffer.toString(), sharedSubject);
for (final Map.Entry<Uri, String> e : uriMap.entrySet()) {
addSharedPartToDraft(e.getValue(), e.getKey());
}