From a87225d976ff1260e675c2b5dbe16d5b36b29cdc Mon Sep 17 00:00:00 2001 From: Artem Shvadskiy Date: Mon, 9 May 2016 14:02:08 -0700 Subject: Check additional extra for sms text from share Intent Change-Id: I1f04f54dfb2dc89ecae7717a33080e15ede5b6c7 issue-id: CYNGNOS-2551 (cherry picked from commit 4bd35b2f0ec3dff9fd76a76a0cb473da8e63951f) --- .../messaging/ui/conversationlist/ShareIntentActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index ef7fcef..6f3c968 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -40,6 +40,7 @@ import java.util.ArrayList; public class ShareIntentActivity extends BaseBugleActivity implements ShareIntentFragment.HostInterface { + private static final String EXTRA_SMS_BODY = "sms_body"; private MessageData mDraftMessage; @@ -81,7 +82,12 @@ public class ShareIntentActivity extends BaseBugleActivity implements contentUri, intent.getType(), contentType)); } if (ContentType.TEXT_PLAIN.equals(contentType)) { - final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + // Text could be stored in either key. Try both. + String sharedText = intent.getStringExtra(EXTRA_SMS_BODY); + if (TextUtils.isEmpty(sharedText)) { + sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + } + if (sharedText != null) { mDraftMessage = MessageData.createSharedMessage(sharedText); } else { -- cgit v1.2.3