summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorHuahui Wu <hwu@google.com>2011-06-28 10:12:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-28 10:12:30 -0700
commit4a7794c4d4db046357647f4b435d711be7b9eeaa (patch)
treece3543b9e7a46e000dcd326a5f07d513aa5c4451 /src/com
parent49fca5ed3ffd8ebee0f93df2f21d5bc027ff5020 (diff)
parent16b6806562476950f5c26878ebf1d6075f1a16d8 (diff)
downloadpackages_apps_Browser-4a7794c4d4db046357647f4b435d711be7b9eeaa.zip
packages_apps_Browser-4a7794c4d4db046357647f4b435d711be7b9eeaa.tar.gz
packages_apps_Browser-4a7794c4d4db046357647f4b435d711be7b9eeaa.tar.bz2
Merge "Revert "Shows the right URL that has a cert error.""
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/Controller.java3
-rw-r--r--src/com/android/browser/PageDialogsHandler.java25
2 files changed, 10 insertions, 18 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 7abda69..9a015b2 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1694,7 +1694,8 @@ public class Controller
break;
case R.id.page_info_menu_id:
- mPageDialogsHandler.showPageInfo(mTabControl.getCurrentTab(), false, null);
+ mPageDialogsHandler.showPageInfo(mTabControl.getCurrentTab(),
+ false);
break;
case R.id.classic_history_menu_id:
diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index b39d863..c902f65 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -39,7 +39,6 @@ public class PageDialogsHandler {
private Context mContext;
private Controller mController;
private boolean mPageInfoFromShowSSLCertificateOnError;
- private String mUrlCertificateOnError;
private Tab mPageInfoView;
private AlertDialog mPageInfoDialog;
@@ -64,9 +63,7 @@ public class PageDialogsHandler {
public void onConfigurationChanged(Configuration config) {
if (mPageInfoDialog != null) {
mPageInfoDialog.dismiss();
- showPageInfo(mPageInfoView,
- mPageInfoFromShowSSLCertificateOnError,
- mUrlCertificateOnError);
+ showPageInfo(mPageInfoView, mPageInfoFromShowSSLCertificateOnError);
}
if (mSSLCertificateDialog != null) {
mSSLCertificateDialog.dismiss();
@@ -74,9 +71,8 @@ public class PageDialogsHandler {
}
if (mSSLCertificateOnErrorDialog != null) {
mSSLCertificateOnErrorDialog.dismiss();
- showSSLCertificateOnError(mSSLCertificateOnErrorView,
- mSSLCertificateOnErrorHandler,
- mSSLCertificateOnErrorError);
+ showSSLCertificateOnError(mSSLCertificateOnErrorView, mSSLCertificateOnErrorHandler,
+ mSSLCertificateOnErrorError);
}
if (mHttpAuthenticationDialog != null) {
mHttpAuthenticationDialog.reshow();
@@ -130,19 +126,16 @@ public class PageDialogsHandler {
* this dialog was opened from the SSL-certificate-on-error dialog or
* not. This is important, since we need to know whether to return to
* the parent dialog or simply dismiss.
- * @param urlCertificateOnError The URL that invokes SSLCertificateError.
- * Null when fromShowSSLCertificateOnError is false.
*/
void showPageInfo(final Tab tab,
- final boolean fromShowSSLCertificateOnError,
- final String urlCertificateOnError) {
+ final boolean fromShowSSLCertificateOnError) {
final LayoutInflater factory = LayoutInflater.from(mContext);
final View pageInfoView = factory.inflate(R.layout.page_info, null);
final WebView view = tab.getWebView();
- String url = fromShowSSLCertificateOnError ? urlCertificateOnError : tab.getUrl();
+ String url = tab.getUrl();
String title = tab.getTitle();
if (url == null) {
@@ -157,7 +150,6 @@ public class PageDialogsHandler {
mPageInfoView = tab;
mPageInfoFromShowSSLCertificateOnError = fromShowSSLCertificateOnError;
- mUrlCertificateOnError = urlCertificateOnError;
AlertDialog.Builder alertDialogBuilder =
new AlertDialog.Builder(mContext)
@@ -269,7 +261,7 @@ public class PageDialogsHandler {
mSSLCertificateDialog = null;
mSSLCertificateView = null;
- showPageInfo(tab, false, null);
+ showPageInfo(tab, false);
}
})
.setOnCancelListener(
@@ -278,7 +270,7 @@ public class PageDialogsHandler {
mSSLCertificateDialog = null;
mSSLCertificateView = null;
- showPageInfo(tab, false, null);
+ showPageInfo(tab, false);
}
})
.show();
@@ -367,8 +359,7 @@ public class PageDialogsHandler {
showPageInfo(mController.getTabControl()
.getTabFromView(view),
- true,
- error.getUrl());
+ true);
}
})
.setOnCancelListener(