Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev

Browse Source 
automerge: ee8feae

* commit 'ee8feae5d4624e6759e264cc80eac28b0d0af20f':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
This commit is contained in:
Paul Jensen
2014-12-17 18:36:31 +00:00
committed by android-build-merger
parent 525833bea3 ee8feae5d4
commit eece333955
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/CaptivePortalLogin/assets/locked_page.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

15
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -28,6 +28,7 @@ import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.Proxy;
import android.net.Uri;
import android.net.http.SslError;
import android.os.Bundle;
import android.provider.Settings;
import android.provider.Settings.Global;
@@ -37,6 +38,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;
@@ -251,6 +253,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 {