X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutWebViewFragment.kt;h=44bae91dd7591c39c038f792843bae75ada7cce0;hb=1d656c562831f535aa33903d44198dd890393f4f;hp=2d450bc863c3074cc0921ee174c17b86a079be04;hpb=725e4a525bed43f46e24ecc97eafcc339a48939c;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt index 2d450bc8..44bae91d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt @@ -89,7 +89,7 @@ class AboutWebViewFragment : Fragment() { // Set a WebView client. tabWebView.webViewClient = object : WebViewClient() { - // `shouldOverrideUrlLoading` allows the sending of external links back to the main Privacy Browser WebView. The deprecated `shouldOverrideUrlLoading` must be used until API >= 24. + // // Send external links back to the main Privacy Browser WebView. The deprecated `shouldOverrideUrlLoading` must be used until API >= 24. override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { // Create an intent to view the URL. val urlIntent = Intent(Intent.ACTION_VIEW) @@ -99,11 +99,14 @@ class AboutWebViewFragment : Fragment() { // Make it so. startActivity(urlIntent) + + // Consume the click. return true } - + + // Process asset requests with the asset loader. override fun shouldInterceptRequest(webView: WebView, url: String): WebResourceResponse? { - // Have the WebView asset loader process the request. This allows the loading of SVG files, which otherwise is prevented by the CORS policy. + // This allows using the `appassets.androidplatform.net` URL, which handles the loading of SVG files, which otherwise is prevented by the CORS policy. return webViewAssetLoader.shouldInterceptRequest(Uri.parse(url)) } } @@ -152,4 +155,4 @@ class AboutWebViewFragment : Fragment() { savedInstanceState.putInt(SCROLL_Y, tabWebView.scrollY) } } -} \ No newline at end of file +}