Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac4243f1 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Make ACTION_SEND and ACTION_SEND_MULTIPLE build full clip items. 

The current code was just for transferring URI grants.  This change
makes it so it propagates all of the relevant extra data into the
ClipData, so developers can just retrieve the ClipData for all of
their data needs.

Change-Id: I36a050c7beae325aceb84518337f878c337d8b86
parent ac76e722

core/java/android/content/Intent.java

+40 −13
Original line number Diff line number Diff line
@@ -6576,35 +6576,54 @@ public class Intent implements Parcelable, Cloneable { 


        final String action = getAction();

        if (ACTION_SEND.equals(action)) {

            final Uri stream;

            Uri stream = null;

            try {

                stream = getParcelableExtra(EXTRA_STREAM);

            } catch (ClassCastException e) {

                return;

            }

            if (stream != null) {

            final CharSequence text = getCharSequenceExtra(EXTRA_TEXT);

            final String htmlText = getStringExtra(EXTRA_HTML_TEXT);

            if (stream != null || text != null || htmlText != null) {

                final ClipData clipData = new ClipData(

                        null, new String[] { getType() }, new ClipData.Item(stream));



                        null, new String[] { getType() },

                        new ClipData.Item(text, htmlText, null, stream));

                setClipData(clipData);

                addFlags(FLAG_GRANT_READ_URI_PERMISSION);

            }



        } else if (ACTION_SEND_MULTIPLE.equals(action)) {

            final ArrayList<Uri> streams;

            ArrayList<Uri> streams = null;

            try {

                streams = getParcelableArrayListExtra(EXTRA_STREAM);

            } catch (ClassCastException e) {

            }

            final ArrayList<CharSequence> texts = getCharSequenceArrayListExtra(EXTRA_TEXT);

            final ArrayList<String> htmlTexts = getStringArrayListExtra(EXTRA_HTML_TEXT);

            int num = -1;

            if (streams != null) {

                num = streams.size();

            }

            if (texts != null) {

                if (num >= 0 && num != texts.size()) {

                    // Wha...!  F- you.

                    return;

                }

                num = texts.size();

            }

            if (htmlTexts != null) {

                if (num >= 0 && num != htmlTexts.size()) {

                    // Wha...!  F- you.

                    return;

                }

            if (streams != null && streams.size() > 0) {

                final Uri firstStream = streams.get(0);

                num = htmlTexts.size();

            }

            if (num > 0) {

                final ClipData clipData = new ClipData(

                        null, new String[] { getType() }, new ClipData.Item(firstStream));

                        null, new String[] { getType() },

                        makeClipItem(streams, texts, htmlTexts, 0));



                final int size = streams.size();

                for (int i = 1; i < size; i++) {

                    clipData.addItem(new ClipData.Item(streams.get(i)));

                for (int i = 1; i < num; i++) {

                    clipData.addItem(makeClipItem(streams, texts, htmlTexts, i));

                }



                setClipData(clipData);
@@ -6612,4 +6631,12 @@ public class Intent implements Parcelable, Cloneable { 
            }

        }

    }



    private static ClipData.Item makeClipItem(ArrayList<Uri> streams, ArrayList<CharSequence> texts,

            ArrayList<String> htmlTexts, int which) {

        Uri uri = streams != null ? streams.get(which) : null;

        CharSequence text = texts != null ? texts.get(which) : null;

        String htmlText = htmlTexts != null ? htmlTexts.get(which) : null;

        return new ClipData.Item(text, htmlText, null, uri);

    }

}