Wait for redirects before showing main webview

dylanmccall · dylanmccall · commit a4de46387bc4 · 2023-03-21T11:55:57.000-07:00
The onPageFinished callback fires when a page is redirected to another one. We can detect if a new page load is started before the previous page is finished, and wait for that new page load to finish. https://phabricator.endlessm.com/T34576
diff --git a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -221,22 +221,27 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             mWebView.getSettings().setAllowUniversalAccessFromFileURLs(true);
             mWebView.getSettings().setMediaPlaybackRequiresUserGesture(false);
             mWebView.setWebViewClient(new WebViewClient() {
+                boolean isRedirected = false;
+
+                @Override
+                public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                    isRedirected = false;
+                }
+
                 @Override
                 public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                    isRedirected = true;
                     return tryOpenExternalLink(url);
                 }
 
                 @Override
                 public void onPageFinished(WebView view, String url) {
-                    Log.i(TAG, "MainPythonWebViewClient onPageFinished");
+                    if (isRedirected) {
+                        return;
+                    }
+
+                    Log.v(TAG, "MainPythonWebViewClient loading finished");
                     displayMainWebView();
-                    // FIXME: We should use postVisualStateCallback here...
-                    // mWebView.postVisualStateCallback(123, new WebView.VisualStateCallback() {
-                    //     @Override
-                    //     public void onComplete(long requestId) {
-                    //         displayMainWebView();
-                    //     }
-                    // });
                 }
             });
             mWebViewSwitcher.addView(mWebView, 1);
