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

Commit 709c46a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix captive portal can't show certificate problem" into qt-dev

parents 14aabea0 cd31d197
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -485,7 +485,10 @@ public class CaptivePortalLoginActivity extends Activity {
            if (request.isForMainFrame()) {
                mMainFrameUrl = request.getUrl().toString();
            }
            return false;
            // Be careful that two shouldOverrideUrlLoading methods are overridden, but
            // shouldOverrideUrlLoading(WebView view, String url) was deprecated in API level 24.
            // TODO: delete deprecated one ??
            return shouldOverrideUrlLoading(view, mMainFrameUrl);
        }

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