Revert "Allow intent shared subject or title to be mms subject"

This reverts commit ae3064cfe0c99c501d7bc4e93f997613015f25ac.

Change-Id: I68279b249950e4433c77a9defb9360f8e4a36953

2 files changed, 4 insertions, 14 deletions

diff --git a/src/com/android/messaging/datamodel/data/MessageData.java b/src/com/android/messaging/datamodel/data/MessageData.java
index a8c8bc1..cb5311e 100644
--- a/src/com/android/messaging/datamodel/data/MessageData.java
+++ b/src/com/android/messaging/datamodel/data/MessageData.java
@@ -297,11 +297,9 @@ public class MessageData implements Parcelable {
     /**
      * Create a message not yet associated with a particular conversation
      */
-    public static MessageData createSharedMessage(final String messageText,
-            final String subjectText) {
+    public static MessageData createSharedMessage(final String messageText) {
         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 be94fa1..6d51de2 100644
--- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
@@ -77,14 +77,6 @@ public class ShareIntentActivity extends BaseBugleActivity implements
     public void onAttachFragment(final Fragment fragment) {
         final Intent intent = getIntent();
         final String action = intent.getAction();
-
-        String sharedSubject = null;
-        if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
-            sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-        } else if (intent.hasExtra(Intent.EXTRA_TITLE)) {
-            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)) {
@@ -102,7 +94,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
             if (ContentType.TEXT_PLAIN.equals(contentType)) {
                 final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
                 if (sharedText != null) {
-                    mDraftMessage = MessageData.createSharedMessage(sharedText, sharedSubject);
+                    mDraftMessage = MessageData.createSharedMessage(sharedText);
                 } else {
                     mDraftMessage = null;
                 }
@@ -111,7 +103,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
                     ContentType.isAudioType(contentType) ||
                     ContentType.isVideoType(contentType)) {
                 if (contentUri != null) {
-                    mDraftMessage = MessageData.createSharedMessage(null, sharedSubject);
+                    mDraftMessage = MessageData.createSharedMessage(null);
                     addSharedImagePartToDraft(contentType, contentUri);
                 } else {
                     mDraftMessage = null;
@@ -131,7 +123,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements
                 final ArrayList<Uri> imageUris = intent.getParcelableArrayListExtra(
                         Intent.EXTRA_STREAM);
                 if (imageUris != null && imageUris.size() > 0) {
-                    mDraftMessage = MessageData.createSharedMessage(null, sharedSubject);
+                    mDraftMessage = MessageData.createSharedMessage(null);
                     for (final Uri imageUri : imageUris) {
                         if (UriUtil.isFileUri(imageUri)) {
                             LogUtil.i(