diff options
| author | Andreas Sandblad <andreas.sandblad@sonyericsson.com> | 2010-06-16 13:10:39 +0200 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonyericsson.com> | 2010-07-14 10:38:08 +0200 |
| commit | d159ec534823b87f9896843e95912b0df8c27e16 (patch) | |
| tree | 9893af29808b268c3f5946b62ac1b7640bf23081 /src/com/android/browser/DownloadTouchIcon.java | |
| parent | 307bddd3006fd4d0fd8f8c6b63cd781582e6fb09 (diff) | |
| download | android_packages_apps_Gello-d159ec534823b87f9896843e95912b0df8c27e16.tar.gz android_packages_apps_Gello-d159ec534823b87f9896843e95912b0df8c27e16.tar.bz2 android_packages_apps_Gello-d159ec534823b87f9896843e95912b0df8c27e16.zip | |
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/DownloadTouchIcon.java')
| -rw-r--r-- | src/com/android/browser/DownloadTouchIcon.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/browser/DownloadTouchIcon.java b/src/com/android/browser/DownloadTouchIcon.java index b5369aeb..14404ff0 100644 --- a/src/com/android/browser/DownloadTouchIcon.java +++ b/src/com/android/browser/DownloadTouchIcon.java @@ -23,15 +23,18 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.http.AndroidHttpClient; +import android.net.Proxy; import android.os.AsyncTask; import android.provider.Browser; import android.webkit.WebView; import org.apache.http.HttpEntity; +import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.params.HttpClientParams; +import org.apache.http.conn.params.ConnRouteParams; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -43,10 +46,12 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { private final String mOriginalUrl; private final String mUrl; private final String mUserAgent; + private final BrowserActivity mActivity; /* package */ Tab mTab; - public DownloadTouchIcon(Tab tab, ContentResolver cr, WebView view) { + public DownloadTouchIcon(Tab tab, BrowserActivity activity, ContentResolver cr, WebView view) { mTab = tab; + mActivity = activity; mContentResolver = cr; // Store these in case they change. mOriginalUrl = view.getOriginalUrl(); @@ -56,6 +61,7 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { public DownloadTouchIcon(ContentResolver cr, String url) { mTab = null; + mActivity = null; mContentResolver = cr; mOriginalUrl = null; mUrl = url; @@ -71,6 +77,11 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { AndroidHttpClient client = AndroidHttpClient.newInstance( mUserAgent); + HttpHost httpHost = Proxy.getPreferredHttpHost(mActivity, url); + if (httpHost != null) { + ConnRouteParams.setDefaultProxy(client.getParams(), httpHost); + } + HttpGet request = new HttpGet(url); // Follow redirects |