X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutWebViewFragment.kt;h=96a475b5ff3df039a51d6022e4663e79782ef550;hb=514e93baaa8389dc9c5abdb79e68c890c260b8d3;hp=0a93fb0cdecf8f51dc517c9f2004e5dd46398889;hpb=91154b307513e7bc6958b27fba518e4f9b564cf9;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 0a93fb0c..96a475b5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt @@ -1,31 +1,32 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright © 2016-2023 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.fragments import android.content.Intent import android.content.res.Configuration -import android.net.Uri +import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.webkit.WebResourceRequest import android.webkit.WebResourceResponse import android.webkit.WebView import android.webkit.WebViewClient @@ -38,11 +39,13 @@ import androidx.webkit.WebViewFeature import com.stoutner.privacybrowser.R -// Declare the class constants. +// Define the class constants. private const val TAB_NUMBER = "tab_number" +private const val SCROLL_X = "scroll_x" +private const val SCROLL_Y = "scroll_y" class AboutWebViewFragment : Fragment() { - // Declare the class variables. + // Define the class variables. private var tabNumber = 0 // Declare the class views. @@ -76,7 +79,7 @@ class AboutWebViewFragment : Fragment() { } override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - // Inflate the layout. False does not attach the inflated layout as a child of container. The fragment will take care of attaching the root automatically. + // Inflate the layout. The fragment will take care of attaching the root automatically. webViewLayout = layoutInflater.inflate(R.layout.bare_webview, container, false) // Get a handle for tab WebView. @@ -87,31 +90,35 @@ 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. - override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { + // Send external links back to the main Privacy Browser WebView. + override fun shouldOverrideUrlLoading(view: WebView, webResourceRequest: WebResourceRequest): Boolean { // Create an intent to view the URL. val urlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - urlIntent.data = Uri.parse(url) + urlIntent.data = webResourceRequest.url // Make it so. startActivity(urlIntent) + + // Consume the click. return true } - - 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. - return webViewAssetLoader.shouldInterceptRequest(Uri.parse(url)) + + // Process asset requests with the asset loader. + override fun shouldInterceptRequest(webView: WebView, webResourceRequest: WebResourceRequest): WebResourceResponse? { + // 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(webResourceRequest.url) } } // Get the current theme status. val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - // Check to see if the app is in night mode. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The app is in night mode. + // Check to see if the app is in night mode. This can be removed once the minimum API >= 33. + if ((Build.VERSION.SDK_INT < 33) && (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The app is in night mode. // Apply the dark WebView theme. + @Suppress("DEPRECATION") WebSettingsCompat.setForceDark(tabWebView.settings, WebSettingsCompat.FORCE_DARK_ON) } @@ -128,8 +135,8 @@ class AboutWebViewFragment : Fragment() { // Scroll the tab if the saved instance state is not null. if (savedInstanceState != null) { tabWebView.post { - tabWebView.scrollX = savedInstanceState.getInt("scroll_x") - tabWebView.scrollY = savedInstanceState.getInt("scroll_y") + tabWebView.scrollX = savedInstanceState.getInt(SCROLL_X) + tabWebView.scrollY = savedInstanceState.getInt(SCROLL_Y) } } @@ -146,8 +153,8 @@ class AboutWebViewFragment : Fragment() { // Save the scroll positions if the layout is not null, which can happen if a tab is not currently selected. if (tabWebView != null) { - savedInstanceState.putInt("scroll_x", tabWebView.scrollX) - savedInstanceState.putInt("scroll_y", tabWebView.scrollY) + savedInstanceState.putInt(SCROLL_X, tabWebView.scrollX) + savedInstanceState.putInt(SCROLL_Y, tabWebView.scrollY) } } -} \ No newline at end of file +}