diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-20 00:31:54 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-20 00:31:54 +0000 |
commit | 966ce8781af231899df04be7cc6caba30317a1fe (patch) | |
tree | b03102e4f822226f0deadac24d45aa4e6ded9930 | |
parent | 0075ae8ac4a8f0edb14b6616cc280c5402d7bb76 (diff) | |
parent | 6d624e6db479555f10c9896bf62aeab00312c69a (diff) | |
download | packages_apps_Messaging-966ce8781af231899df04be7cc6caba30317a1fe.tar.gz packages_apps_Messaging-966ce8781af231899df04be7cc6caba30317a1fe.tar.bz2 packages_apps_Messaging-966ce8781af231899df04be7cc6caba30317a1fe.zip |
Merge cherrypicks of [4586293, 4586294, 4586295, 4584365, 4584366, 4584367, 4584368, 4584369, 4584370, 4587544, 4584705, 4586296, 4587545, 4587546, 4586297, 4586298, 4586299, 4586300, 4584371, 4586301, 4584706, 4586302, 4586303, 4587584, 4587585, 4587586, 4587587, 4587588, 4587589, 4587590, 4587591, 4587644, 4587645, 4587646, 4587647, 4587648, 4587649, 4587650, 4587651, 4587652, 4587653, 4587654, 4587655, 4587656, 4587657, 4587658, 4587659, 4587660, 4587661, 4587662, 4584536, 4587547, 4587548, 4587549, 4584707, 4584708, 4587550, 4587551, 4587593, 4586516, 4584372, 4584373, 4584374, 4587595, 4584375, 4584376, 4587552, 4587596, 4587597, 4587598, 4587599, 4584414, 4584415, 4584416, 4584417, 4584418, 4584419, 4584420, 4584421, 4584422, 4584423, 4587804, 4587805, 4587806, 4587807, 4587808, 4587809, 4587810, 4587811, 4587812, 4587813, 4587814, 4587815, 4587816, 4587817, 4587818, 4587884, 4587885, 4587600, 4587601, 4587819, 4584709] into sparse-4749909-L91900000192339903
Change-Id: I45dfd635c93a12761f3306c959951e96ead6c2cf
-rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 13 | ||||
-rw-r--r-- | src/com/android/messaging/util/DebugUtils.java | 22 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index 83b7be9..1c91e46 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -35,6 +35,7 @@ import com.android.messaging.util.ContentType; import com.android.messaging.util.LogUtil; import com.android.messaging.util.MediaMetadataRetrieverWrapper; import com.android.messaging.util.FileUtil; +import com.android.messaging.util.UriUtil; import java.io.IOException; import java.util.ArrayList; @@ -75,6 +76,12 @@ public class ShareIntentActivity extends BaseBugleActivity implements final String action = intent.getAction(); if (Intent.ACTION_SEND.equals(action)) { final Uri contentUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); + if (UriUtil.isFileUri(contentUri)) { + LogUtil.i( + LogUtil.BUGLE_TAG, + "Ignoring attachment from file URI which are no longer supported."); + return; + } final String contentType = extractContentType(contentUri, intent.getType()); if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.DEBUG)) { LogUtil.d(LogUtil.BUGLE_TAG, String.format( @@ -112,6 +119,12 @@ public class ShareIntentActivity extends BaseBugleActivity implements if (imageUris != null && imageUris.size() > 0) { mDraftMessage = MessageData.createSharedMessage(null); for (final Uri imageUri : imageUris) { + if (UriUtil.isFileUri(imageUri)) { + LogUtil.i( + LogUtil.BUGLE_TAG, + "Ignoring attachment from file URI which are no longer supported."); + continue; + } final String actualContentType = extractContentType(imageUri, contentType); addSharedImagePartToDraft(actualContentType, imageUri); } diff --git a/src/com/android/messaging/util/DebugUtils.java b/src/com/android/messaging/util/DebugUtils.java index f2c1d65..1362f83 100644 --- a/src/com/android/messaging/util/DebugUtils.java +++ b/src/com/android/messaging/util/DebugUtils.java @@ -22,12 +22,15 @@ import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.media.MediaPlayer; +import android.net.Uri; import android.os.Environment; import android.telephony.SmsMessage; import android.text.TextUtils; import android.widget.ArrayAdapter; +import com.android.messaging.Factory; import com.android.messaging.R; import com.android.messaging.datamodel.SyncManager; import com.android.messaging.datamodel.action.DumpDatabaseAction; @@ -179,6 +182,13 @@ public class DebugUtils { } }); + arrayAdapter.add(new DebugAction("Test sharing a file URI") { + @Override + public void run() { + shareFileUri(); + } + }); + builder.setAdapter(arrayAdapter, new android.content.DialogInterface.OnClickListener() { @Override @@ -422,4 +432,16 @@ public class DebugUtils { public static boolean debugClassZeroSmsEnabled() { return sDebugClassZeroSms; } + + /** Shares a ringtone file via file URI. */ + private static void shareFileUri() { + final String packageName = "com.android.messaging"; + final String fileName = "/system/media/audio/ringtones/Andromeda.ogg"; + + Intent intent = new Intent(Intent.ACTION_SEND); + intent.setPackage(packageName); + intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + fileName)); + intent.setType("image/*"); + Factory.get().getApplicationContext().startActivity(intent); + } } |