diff options
author | David Smith <davidas@google.com> | 2018-05-01 14:54:46 -0700 |
---|---|---|
committer | syphyr <syphyr@gmail.com> | 2018-08-07 21:35:13 +0200 |
commit | 67b671fec7ed7006763f5775b0ae08e71ecba8f3 (patch) | |
tree | e0a82dbd944748b069da9344315e15aef178e145 | |
parent | d21b478314fca67038248936959e8a380ba1bae4 (diff) | |
download | packages_apps_Messaging-67b671fec7ed7006763f5775b0ae08e71ecba8f3.tar.gz packages_apps_Messaging-67b671fec7ed7006763f5775b0ae08e71ecba8f3.tar.bz2 packages_apps_Messaging-67b671fec7ed7006763f5775b0ae08e71ecba8f3.zip |
Messaging ignores file URIs shared via intent
Fixes b/37629504 by not creating attachments from file URIs shared via
intent. Sharing file URIs is disallowed by Android N and later and is no
longer supported for this app.
Test: manual using the Debug command added in this change
Change-Id: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
Merged-In: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
(cherry picked from commit 9deefdf182d69f98d361d9d24de1e4892923dac5)
-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 d62a154..6d51de2 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -36,6 +36,7 @@ import com.android.messaging.util.LogUtil; import com.android.messaging.util.MediaMetadataRetrieverWrapper; import com.android.messaging.util.FileUtil; import com.android.messaging.util.UiUtils; +import com.android.messaging.util.UriUtil; import java.io.IOException; import java.util.ArrayList; @@ -78,6 +79,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( @@ -118,6 +125,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); + } } |