Bump the minimum API to 24 (Android 7).

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / AboutWebViewFragment.kt

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 3b516ec546d53b5824f51f3ffdc4a1348999f611..96a475b5ff3df039a51d6022e4663e79782ef550 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -21,7 +21,7 @@ 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
@@ -79,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.
@@ -90,14 +90,13 @@ class AboutWebViewFragment : Fragment() {
 
         // Set a WebView client.
         tabWebView.webViewClient = object : WebViewClient() {
-            // // Send external links back to the main Privacy Browser WebView.  The deprecated `shouldOverrideUrlLoading` must be used until API >= 24.
-            @Deprecated("Deprecated in Java")
-            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)
@@ -116,9 +115,10 @@ class AboutWebViewFragment : Fragment() {
         // 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)
         }