diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-16 14:16:58 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-16 16:16:13 -0700 |
commit | 5dbfdf9928b782c9325864ed1e8dd0ff22ebc286 (patch) | |
tree | c242107c1b4eb215a88cc3d09f5d67e140b0d140 /src | |
parent | b50d7403816f316fdcaf5b5a318383e64f1a8775 (diff) | |
parent | e7c06a6eb880bec19bfe43a0ac09ca9c6d20c049 (diff) | |
download | packages_apps_browser-5dbfdf9928b782c9325864ed1e8dd0ff22ebc286.zip packages_apps_browser-5dbfdf9928b782c9325864ed1e8dd0ff22ebc286.tar.gz packages_apps_browser-5dbfdf9928b782c9325864ed1e8dd0ff22ebc286.tar.bz2 |
resolved conflicts for merge of e7c06a6e to master
Change-Id: If4f2cb14d9a05dc58322732a922e3300ff1a4558
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/browser/DownloadTouchIcon.java | 14 | ||||
-rw-r--r-- | src/com/android/browser/FetchUrlMimeType.java | 7 | ||||
-rw-r--r-- | src/com/android/browser/Tab.java | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/com/android/browser/DownloadTouchIcon.java b/src/com/android/browser/DownloadTouchIcon.java index 99925dc..98e14fb 100644 --- a/src/com/android/browser/DownloadTouchIcon.java +++ b/src/com/android/browser/DownloadTouchIcon.java @@ -23,6 +23,7 @@ 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.os.Bundle; import android.os.Message; @@ -30,9 +31,11 @@ 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; @@ -46,6 +49,7 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { private final String mUserAgent; // Sites may serve a different icon to different UAs private Message mMessage; + private final BrowserActivity mActivity; /* package */ Tab mTab; /** @@ -53,8 +57,9 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { * the originalUrl so we take account of redirects. Used when the user * bookmarks a page from outside the bookmarks activity. */ - 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(); @@ -71,6 +76,7 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { */ public DownloadTouchIcon(ContentResolver cr, String url) { mTab = null; + mActivity = null; mContentResolver = cr; mOriginalUrl = null; mUrl = url; @@ -84,6 +90,7 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { */ public DownloadTouchIcon(Message msg, String userAgent) { mMessage = msg; + mActivity = null; mContentResolver = null; mOriginalUrl = null; mUrl = null; @@ -103,6 +110,11 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> { if (inBookmarksDatabase || mMessage != null) { 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 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); diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index f7438da..a313651 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -1035,7 +1035,7 @@ class Tab { } // Have only one async task at a time. if (mTouchIconLoader == null) { - mTouchIconLoader = new DownloadTouchIcon(Tab.this, cr, view); + mTouchIconLoader = new DownloadTouchIcon(Tab.this, mActivity, cr, view); mTouchIconLoader.execute(url); } } |