Fix sharing text via ShareActivity intents

Fixes #2855
Closes #2865

// FREEBIE
This commit is contained in:
Jake McGinty 2015-04-02 11:23:18 -07:00 committed by Moxie Marlinspike
parent 4e4538f4e8
commit ca2c8b961e
2 changed files with 2 additions and 2 deletions

View File

@ -237,7 +237,7 @@ public class ConversationFragment extends ListFragment
private void handleForwardMessage(MessageRecord message) { private void handleForwardMessage(MessageRecord message) {
Intent composeIntent = new Intent(getActivity(), ShareActivity.class); Intent composeIntent = new Intent(getActivity(), ShareActivity.class);
composeIntent.putExtra(ConversationActivity.DRAFT_TEXT_EXTRA, message.getDisplayBody().toString()); composeIntent.putExtra(Intent.EXTRA_TEXT, message.getDisplayBody().toString());
startActivity(composeIntent); startActivity(composeIntent);
} }

View File

@ -117,7 +117,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
private Intent getBaseShareIntent(final Class<?> target) { private Intent getBaseShareIntent(final Class<?> target) {
final Intent intent = new Intent(this, target); final Intent intent = new Intent(this, target);
final String textExtra = getIntent().getStringExtra(ConversationActivity.DRAFT_TEXT_EXTRA); final String textExtra = getIntent().getStringExtra(Intent.EXTRA_TEXT);
final Uri streamExtra = getIntent().getParcelableExtra(Intent.EXTRA_STREAM); final Uri streamExtra = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
final String type = streamExtra != null ? getMimeType(streamExtra) : getIntent().getType(); final String type = streamExtra != null ? getMimeType(streamExtra) : getIntent().getType();