From 4ab72cb7e79c15b94b4b7aca4cdb28677a615f8a Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 15 Mar 2010 15:13:17 -0700 Subject: b/2511635 Browser displays incorrect SSL cert information WebView's mCertificate member was not cleared when going to new pages. Rather than clearing mCertificate as was done in previously in WebView.goBackOrForward, we now clear when CallbackProxy receives a PAGE_STARTED message. This problem was highlighted whenever we went to a https page that was in the cache, since the cache does not store certificate information, so "More > Page Info > View Certifcate" was showing the certificate of the last non-cached page because it had not been cleared. See also b/2516638 "SslCertificate information not cached by CacheManager" Change-Id: I40284f22ceb7150a6b20ecc2741f6153ed9a3276 --- core/java/android/webkit/WebView.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'core/java/android/webkit/WebView.java') diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 83cd528a347b..034a63110166 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1608,13 +1608,6 @@ public class WebView extends AbsoluteLayout } private void goBackOrForward(int steps, boolean ignoreSnapshot) { - // every time we go back or forward, we want to reset the - // WebView certificate: - // if the new site is secure, we will reload it and get a - // new certificate set; - // if the new site is not secure, the certificate must be - // null, and that will be the case - mCertificate = null; if (steps != 0) { clearTextEntry(false); mWebViewCore.sendMessage(EventHub.GO_BACK_FORWARD, steps, -- cgit v1.2.3