Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8022f8 authored by Paul Jensen's avatar Paul Jensen
Browse files

Show broken lock image when SSL errors are encountered in CaptivePortalLogin. 

The WebView cancels the page load by default, so showing an indicative image
at least informs users that there is a security problem.

bug:18505835
bug:18570703
Change-Id: Ie6dd9294eec9ca25d27e95a1cd2c95e3065de469
parent 8b33cf4d

packages/CaptivePortalLogin/assets/locked_page.png

0 → 100644
+7.68 KiB
Loading image diff...

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.net.NetworkRequest; 
import android.net.Proxy;

import android.net.ProxyInfo;

import android.net.Uri;

import android.net.http.SslError;

import android.os.Bundle;

import android.provider.Settings;

import android.provider.Settings.Global;
@@ -39,6 +40,7 @@ import android.view.Menu; 
import android.view.MenuItem;

import android.view.View;

import android.view.Window;

import android.webkit.SslErrorHandler;

import android.webkit.WebChromeClient;

import android.webkit.WebSettings;

import android.webkit.WebView;
@@ -270,6 +272,19 @@ public class CaptivePortalLoginActivity extends Activity { 
            }

            testForCaptivePortal();

        }



        // A web page consisting of a large broken lock icon to indicate SSL failure.

        final static String SSL_ERROR_HTML = "<!DOCTYPE html><html><head><style>" +

                "html { width:100%; height:100%; " +

                "       background:url(locked_page.png) center center no-repeat; }" +

                "</style></head><body></body></html>";



        @Override

        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {

            Log.w(TAG, "SSL error; displaying broken lock icon.");

            view.loadDataWithBaseURL("file:///android_asset/", SSL_ERROR_HTML, "text/HTML",

                    "UTF-8", null);

        }

    }



    private class MyWebChromeClient extends WebChromeClient {