diff options
author | Kristian Monsen <kristianm@google.com> | 2011-03-02 13:14:03 +0000 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-03-02 15:36:34 +0000 |
commit | bc5cc75c302eb49d15258155fc6f672fcbd62842 (patch) | |
tree | f6ca3650fdafa3900110d78c13eef3c79fd8527b /src/com/android/browser/DownloadHandler.java | |
parent | 15c5087dba00b22a1a29b8e9074e3029a4a3dca1 (diff) | |
download | packages_apps_browser-bc5cc75c302eb49d15258155fc6f672fcbd62842.zip packages_apps_browser-bc5cc75c302eb49d15258155fc6f672fcbd62842.tar.gz packages_apps_browser-bc5cc75c302eb49d15258155fc6f672fcbd62842.tar.bz2 |
Downloads from incognito tabs need to use the correct cookie
Change-Id: Iee012fe4a32dd51b8a59763b9ceab1e7dbde5246
Diffstat (limited to 'src/com/android/browser/DownloadHandler.java')
-rw-r--r-- | src/com/android/browser/DownloadHandler.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/browser/DownloadHandler.java b/src/com/android/browser/DownloadHandler.java index 4903a41..17ad320 100644 --- a/src/com/android/browser/DownloadHandler.java +++ b/src/com/android/browser/DownloadHandler.java @@ -53,9 +53,11 @@ public class DownloadHandler { * @param userAgent User agent of the downloading application. * @param contentDisposition Content-disposition http header, if present. * @param mimetype The mimetype of the content reported by the server + * @param privateBrowsing If the request is coming from a private browsing tab. */ public static void onDownloadStart(Activity activity, String url, - String userAgent, String contentDisposition, String mimetype) { + String userAgent, String contentDisposition, String mimetype, + boolean privateBrowsing) { // if we're dealing wih A/V content that's not explicitly marked // for download, check if it's streamable. if (contentDisposition == null @@ -93,7 +95,7 @@ public class DownloadHandler { } } onDownloadStartNoStream(activity, url, userAgent, contentDisposition, - mimetype); + mimetype, privateBrowsing); } // This is to work around the fact that java.net.URI throws Exceptions @@ -134,10 +136,11 @@ public class DownloadHandler { * @param userAgent User agent of the downloading application. * @param contentDisposition Content-disposition http header, if present. * @param mimetype The mimetype of the content reported by the server + * @param privateBrowsing If the request is coming from a private browsing tab. */ /*package */ static void onDownloadStartNoStream(Activity activity, String url, String userAgent, String contentDisposition, - String mimetype) { + String mimetype, boolean privateBrowsing) { String filename = URLUtil.guessFileName(url, contentDisposition, mimetype); @@ -198,7 +201,7 @@ public class DownloadHandler { request.setDescription(webAddress.getHost()); // XXX: Have to use the old url since the cookies were stored using the // old percent-encoded url. - String cookies = CookieManager.getInstance().getCookie(url); + String cookies = CookieManager.getInstance().getCookie(url, privateBrowsing); request.addRequestHeader("cookie", cookies); request.setNotificationVisibility( DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); |