Fix: Add Unit tests and implement selective blocking during importing for outdated webviews

Author: Fandroid745

AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiPackageImporterFragment.kt

@@ -32,6 +32,8 @@ class AnkiPackageImporterFragment : PageFragment() {
         "import-anki-package$filePath"
     }
 
+    override fun requiresModernWebView() = true
+
     override fun onCreateWebViewClient(savedInstanceState: Bundle?): PageWebViewClient {
         // the back callback is only enabled when import is running and showing progress
         val backCallback =

AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt

@@ -37,6 +37,8 @@ class CsvImporter : PageFragment() {
         "import-csv$filePath"
     }
 
+    override fun requiresModernWebView() = true
+
     override fun onCreateWebViewClient(savedInstanceState: Bundle?): PageWebViewClient {
         // the back callback is only enabled when import is running and showing progress
         val backCallback =

AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt

@@ -66,6 +66,8 @@ abstract class PageFragment(
 
     protected open fun onWebViewCreated() { }
 
+    protected open fun requiresModernWebView(): Boolean = false
+
     /**
      * When the webview calls `BridgeCommand("foo")`, the PageFragment execute `bridgeCommands["foo"]`.
      * By default, only bridge command is allowed, subclasses must redefine it if they expect bridge commands.
@@ -75,6 +77,7 @@ abstract class PageFragment(
     /**
      * Ensures that [pageWebViewClient] can receive `bridgeCommand` requests and execute the command from [bridgeCommands].
      */
+
     private fun setupBridgeCommand(pageWebViewClient: PageWebViewClient) {
         if (bridgeCommands.isEmpty()) {
             return
@@ -103,8 +106,8 @@ abstract class PageFragment(
         savedInstanceState: Bundle?,
     ) {
         val ankiActivity = requireActivity() as AnkiActivity
-        if (checkWebviewVersion(ankiActivity)) {
-            Timber.w("Aborting PageFragement load: WebView is outdated")
+        if (requiresModernWebView() && checkWebviewVersion(ankiActivity)) {
+            Timber.w("${this::class.simpleName} requires modern WebView (Chrome 90+), aborting load")
             ankiActivity.onBackPressedDispatcher.onBackPressed()
             return
         }
@@ -114,7 +117,6 @@ abstract class PageFragment(
         view.findViewById<MaterialToolbar>(R.id.toolbar)?.setNavigationOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }
-
         setupWebView(savedInstanceState)
     }
 

AnkiDroid/src/test/java/com/ichi2/utils/WebViewUtilsTest.kt

@@ -55,5 +55,27 @@ class WebViewUtilsTest {
             ),
             equalTo(null),
         )
+        assertThat(
+            "Should catch old engine (78) in Huawei package even with valid versionCode",
+            checkWebViewVersionComponents(
+                "com.huawei.webview",
+                "12.1.2.322",
+                450000000L,
+                "Mozilla/5.0 (Linux; Android 10; CDY-AN90 Build/HUAWEICDY-AN90; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.108 Mobile Safari/537.36",
+            ),
+            equalTo(78),
+        )
+        // Link: https://www.apkmirror.com/apk/huawei/huawei-webview-2/huawei-webview-15-0-4-326-release/
+        // verified version code is 2113L for 15.0.4.326 by analyzing the manifest
+        assertThat(
+            "Huawei v15 with code 21311 should be allowed if UA indicates modern engine (114)",
+            checkWebViewVersionComponents(
+                "com.huawei.webview",
+                "15.0.4.326",
+                21311L,
+                "Mozilla/5.0 (Linux; Android 12; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.196 Mobile Safari/537.36",
+            ),
+            equalTo(null),
+        )
     }
 }