[webview] do not open url if overrided

ekibun · Aug 19, 2019 · 50478ac · 50478ac
1 parent 72fc05c
commit 50478ac
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/view/NestedWebView.kt b/app/src/main/java/soko/ekibun/bangumi/ui/view/NestedWebView.kt
@@ -75,9 +75,14 @@ class NestedWebView @JvmOverloads constructor(context: Context, attrs: Attribute
                 newView.parentWebView = webview
                 webview.childWebView = newView
                 newView.shouldOverrideUrlLoading = { v: WebView, request: WebResourceRequest ->
-                    newView.loadUrl(request.url.toString())
-                    newView.shouldOverrideUrlLoading = webview.shouldOverrideUrlLoading
-                    newView.shouldOverrideUrlLoading(v, request)
+                    val ret = newView.shouldOverrideUrlLoading(v, request)
+                    if (ret) {
+                        newView.close()
+                    } else {
+                        newView.loadUrl(request.url.toString())
+                        newView.shouldOverrideUrlLoading = webview.shouldOverrideUrlLoading
+                    }
+                    ret
                 }
                 val layoutParams = webview.layoutParams
                 parent.removeView(webview)