diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-25 23:24:03 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-25 23:24:03 +0000 |
commit | ea03db33031315418258805c22fdfdb34a4b368b (patch) | |
tree | e85351094de758d853522ef6a8b405488b692ab2 /src/com/android/messaging/ui | |
parent | a072033ce429cdd36bb6b3ae63c2083944994b1e (diff) | |
parent | 9deefdf182d69f98d361d9d24de1e4892923dac5 (diff) | |
download | packages_apps_Messaging-ea03db33031315418258805c22fdfdb34a4b368b.tar.gz packages_apps_Messaging-ea03db33031315418258805c22fdfdb34a4b368b.tar.bz2 packages_apps_Messaging-ea03db33031315418258805c22fdfdb34a4b368b.zip |
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
Change-Id: Ieaca25fa19b578953f88da445e2ecbd4b15f3a98
Diffstat (limited to 'src/com/android/messaging/ui')
-rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 13 |
1 files changed, 13 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); } |