diff options
author | Marco Sirabella <marco@sirabella.org> | 2018-10-26 21:21:36 -0400 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:29:45 +0100 |
commit | 1e87fb2f80d0ce9da6fe0f729d4425d9db225734 (patch) | |
tree | 287e3f4de57aa7cad07d08ff9ba7e0e9b28b1f30 | |
parent | 11aa3ff250b7d1f44fba49ff91b572326848c632 (diff) | |
download | packages_apps_Messaging-1e87fb2f80d0ce9da6fe0f729d4425d9db225734.tar.gz packages_apps_Messaging-1e87fb2f80d0ce9da6fe0f729d4425d9db225734.tar.bz2 packages_apps_Messaging-1e87fb2f80d0ce9da6fe0f729d4425d9db225734.zip |
Allow intent shared subject or title to be mms subject
Test: m, manual
Change-Id: Ibb5eba030320467774cdac1d502ec36c98abcb43
-rw-r--r-- | src/com/android/messaging/datamodel/data/MessageData.java | 4 | ||||
-rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/com/android/messaging/datamodel/data/MessageData.java b/src/com/android/messaging/datamodel/data/MessageData.java index cb5311e..a8c8bc1 100644 --- a/src/com/android/messaging/datamodel/data/MessageData.java +++ b/src/com/android/messaging/datamodel/data/MessageData.java @@ -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)); } diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index 412177e..9ac6e6b 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -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()); } |