Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1467)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java

Issue 2230803004: [Downloads] Use content:// URIs when sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
index 5ea54ce7cd36205f6ed8e6b6f14e012de006758a..80b22beac257d045b6260c59b9006920b4931ddc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
@@ -20,6 +20,8 @@ import android.view.ViewGroup;
import android.widget.ListView;
import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.ContentUriUtils;
+import org.chromium.base.Log;
import org.chromium.base.ObserverList;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BasicNativePage;
@@ -28,6 +30,7 @@ import org.chromium.chrome.browser.widget.FadingShadowView;
import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
import org.chromium.ui.base.DeviceFormFactor;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -254,7 +257,7 @@ public class DownloadManagerUi implements OnMenuItemClickListener {
if (selectedItems.size() == 1) {
// Set up intent for 1 item.
intentAction = Intent.ACTION_SEND;
- shareIntent.putExtra(Intent.EXTRA_STREAM, selectedItems.get(0).getUri());
+ shareIntent.putExtra(Intent.EXTRA_STREAM, getUriForItem(selectedItems.get(0)));
} else {
// Set up intent for multiple items.
intentAction = Intent.ACTION_SEND_MULTIPLE;
@@ -264,7 +267,7 @@ public class DownloadManagerUi implements OnMenuItemClickListener {
if (intentMimeType != null) intentMimeParts = intentMimeType.split(MIME_TYPE_DELIMITER);
for (DownloadHistoryItemWrapper itemWrapper : mSelectionDelegate.getSelectedItems()) {
- itemUris.add(itemWrapper.getUri());
+ itemUris.add(getUriForItem(itemWrapper));
String mimeType = Intent.normalizeMimeType(itemWrapper.getMimeType());
@@ -302,6 +305,19 @@ public class DownloadManagerUi implements OnMenuItemClickListener {
mActivity.getString(R.string.share_link_chooser_title)));
}
+ private Uri getUriForItem(DownloadHistoryItemWrapper itemWrapper) {
+ Uri uri = itemWrapper.getUri();
Theresa 2016/08/10 17:53:51 dfalcantara@ - do you think we'll need getUri() fo
gone 2016/08/10 18:14:57 Yeah, caching makes sense.
Theresa 2016/08/10 18:29:55 Done.
+ try {
+ // Try to obtain a content:// URI, which is preferred to a file:/// URI so that
+ // receiving apps don't attempt to determine the file's mime type (which often fails).
+ uri = ContentUriUtils.getContentUriFromFile(mActivity.getApplicationContext(),
+ new File(itemWrapper.getFilePath()));
+ } catch (IllegalArgumentException e) {
+ Log.e(TAG, "Could not create content uri: " + e);
gone 2016/08/10 18:14:58 If this fails, should we just fall back to using t
Theresa 2016/08/10 18:29:55 Done.
+ }
+ return uri;
+ }
+
private void deleteSelectedItems() {
for (DownloadHistoryItemWrapper wrappedItem : mSelectionDelegate.getSelectedItems()) {
wrappedItem.delete();
« chrome/android/java/res/xml/file_paths.xml ('K') | « chrome/android/java/res/xml/file_paths.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698