summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/FetchUrlMimeType.java
diff options
context:
space:
mode:
authorAndreas Sandblad <andreas.sandblad@sonyericsson.com>2010-06-16 13:10:39 +0200
committerJohan Redestig <johan.redestig@sonyericsson.com>2010-07-14 10:38:08 +0200
commitd159ec534823b87f9896843e95912b0df8c27e16 (patch)
tree9893af29808b268c3f5946b62ac1b7640bf23081 /src/com/android/browser/FetchUrlMimeType.java
parent307bddd3006fd4d0fd8f8c6b63cd781582e6fb09 (diff)
downloadpackages_apps_browser-d159ec534823b87f9896843e95912b0df8c27e16.zip
packages_apps_browser-d159ec534823b87f9896843e95912b0df8c27e16.tar.gz
packages_apps_browser-d159ec534823b87f9896843e95912b0df8c27e16.tar.bz2
Use proxy for downloads.
Use the new Proxy method getPreferredHttpHost to use proxy for downloads. Change-Id: I4224e29ba4b37bd570d84382764e08f9babe6530
Diffstat (limited to 'src/com/android/browser/FetchUrlMimeType.java')
-rw-r--r--src/com/android/browser/FetchUrlMimeType.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java
index 1e4debf..9bd0cf9 100644
--- a/src/com/android/browser/FetchUrlMimeType.java
+++ b/src/com/android/browser/FetchUrlMimeType.java
@@ -17,12 +17,15 @@
package com.android.browser;
import android.content.ContentValues;
+import android.net.Proxy;
import android.net.Uri;
import android.net.http.AndroidHttpClient;
+import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.Header;
import org.apache.http.client.methods.HttpHead;
+import org.apache.http.conn.params.ConnRouteParams;
import java.io.IOException;
@@ -67,6 +70,10 @@ class FetchUrlMimeType extends AsyncTask<ContentValues, String, String> {
// seems ok with that.
AndroidHttpClient client = AndroidHttpClient.newInstance(
mValues.getAsString(Downloads.Impl.COLUMN_USER_AGENT));
+ HttpHost httpHost = Proxy.getPreferredHttpHost(mActivity, uri);
+ if (httpHost != null) {
+ ConnRouteParams.setDefaultProxy(client.getParams(), httpHost);
+ }
HttpHead request = new HttpHead(uri);
String cookie = mValues.getAsString(Downloads.Impl.COLUMN_COOKIE_DATA);