summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-03 14:56:07 +0100
committerSteve Block <steveblock@google.com>2011-10-03 14:56:07 +0100
commit5e65609a9f4e1eda54167ec911206365ff7fde6c (patch)
tree3b996a0a43575763351282cb2cbbc06fd3dde31d
parent42a73941cd48a92aa1980afecb5e78be0b00972c (diff)
downloadpackages_apps_Browser-5e65609a9f4e1eda54167ec911206365ff7fde6c.zip
packages_apps_Browser-5e65609a9f4e1eda54167ec911206365ff7fde6c.tar.gz
packages_apps_Browser-5e65609a9f4e1eda54167ec911206365ff7fde6c.tar.bz2
Fix SSL certificate error page
Don't always claim that the certificate is expired and the date is invalid. Bug: 5403221 Change-Id: I914cfad2d5bba9a7a550c89091201614eef8e60f
-rw-r--r--src/com/android/browser/PageDialogsHandler.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index 14373cb..13e9ceb 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -319,13 +319,13 @@ public class PageDialogsHandler {
if (error.hasError(SslError.SSL_IDMISMATCH)) {
addError(factory, placeholder, R.string.ssl_mismatch);
}
- if (error.hasError(SslError.SSL_EXPIRED) || true) {
+ if (error.hasError(SslError.SSL_EXPIRED)) {
addError(factory, placeholder, R.string.ssl_expired);
}
if (error.hasError(SslError.SSL_NOTYETVALID)) {
addError(factory, placeholder, R.string.ssl_not_yet_valid);
}
- if (error.hasError(SslError.SSL_DATE_INVALID) || true) {
+ if (error.hasError(SslError.SSL_DATE_INVALID)) {
addError(factory, placeholder, R.string.ssl_date_invalid);
}
if (error.hasError(SslError.SSL_INVALID)) {