fix:add test case for huawei and implement the correct fix

Author: Fandroid745

AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt

@@ -193,14 +193,14 @@ import com.ichi2.utils.Permissions
 import com.ichi2.utils.VersionUtils
 import com.ichi2.utils.cancelable
 import com.ichi2.utils.checkBoxPrompt
-import com.ichi2.utils.checkWebviewVersion
 import com.ichi2.utils.configureView
 import com.ichi2.utils.customView
 import com.ichi2.utils.dp
 import com.ichi2.utils.message
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
+import com.ichi2.utils.showDialogIfWebViewOutdated
 import com.ichi2.utils.title
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -598,7 +598,7 @@ open class DeckPicker :
 
         shortAnimDuration = resources.getInteger(android.R.integer.config_shortAnimTime)
 
-        checkWebviewVersion(this)
+        with(this) { showDialogIfWebViewOutdated() }
 
         setFragmentResultListener(REQUEST_KEY) { _, bundle ->
             when (CustomStudyAction.fromBundle(bundle)) {

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

@@ -25,14 +25,15 @@ import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
+import com.ichi2.utils.OLDEST_WORKING_WEBVIEW_VERSION
 
 class AnkiPackageImporterFragment : PageFragment() {
     override val pagePath: String by lazy {
         val filePath = requireArguments().getString(KEY_FILE_PATH)
         "import-anki-package$filePath"
     }
 
-    override fun requiresModernWebView() = true
+    override val minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION
 
     override fun onCreateWebViewClient(savedInstanceState: Bundle?): PageWebViewClient {
         // the back callback is only enabled when import is running and showing progress

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

@@ -27,6 +27,7 @@ import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
+import com.ichi2.utils.OLDEST_WORKING_WEBVIEW_VERSION
 
 /**
  * Anki page used to import text/csv files
@@ -37,7 +38,7 @@ class CsvImporter : PageFragment() {
         "import-csv$filePath"
     }
 
-    override fun requiresModernWebView() = true
+    override val minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION
 
     override fun onCreateWebViewClient(savedInstanceState: Bundle?): PageWebViewClient {
         // the back callback is only enabled when import is running and showing progress

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

@@ -31,7 +31,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.workarounds.OnWebViewRecreatedListener
 import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.themes.Themes
-import com.ichi2.utils.checkWebviewVersion
+import com.ichi2.utils.showDialogIfWebViewOutdated
 import timber.log.Timber
 
 /**
@@ -66,7 +66,7 @@ abstract class PageFragment(
 
     protected open fun onWebViewCreated() { }
 
-    protected open fun requiresModernWebView(): Boolean = false
+    protected open val minimumWebViewVersion: Int? = null
 
     /**
      * When the webview calls `BridgeCommand("foo")`, the PageFragment execute `bridgeCommands["foo"]`.
@@ -106,14 +106,20 @@ abstract class PageFragment(
         savedInstanceState: Bundle?,
     ) {
         val ankiActivity = requireActivity() as AnkiActivity
-        if (requiresModernWebView() && checkWebviewVersion(ankiActivity)) {
-            Timber.w("${this::class.simpleName} requires modern WebView (Chrome 90+), aborting load")
-            ankiActivity.onBackPressedDispatcher.onBackPressed()
-            return
-        }
         server = AnkiServer(this).also { it.start() }
         webViewLayout = view.findViewById(R.id.webview_layout)
 
+        val minVersion = minimumWebViewVersion
+        if (minVersion != null &&
+            with(ankiActivity) {
+                showDialogIfWebViewOutdated(minVersion) {
+                    ankiActivity.onBackPressedDispatcher.onBackPressed()
+                }
+            }
+        ) {
+            Timber.w("${this::class.simpleName} requires modern WebView (Chrome 90+), aborting load")
+            return
+        }
         view.findViewById<MaterialToolbar>(R.id.toolbar)?.setNavigationOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }

AnkiDroid/src/main/java/com/ichi2/utils/WebViewUtils.kt

@@ -27,32 +27,40 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.webkit.WebViewCompat
-import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.CrashReportService
 import com.ichi2.anki.R
+import com.ichi2.anki.utils.openUrl
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-internal const val OLDEST_WORKING_WEBVIEW_VERSION_CODE = 443000000L
-internal const val OLDEST_WORKING_WEBVIEW_VERSION = 90
+/** The Android package version code which corresponds to the Webview version. */
+internal const val OLDEST_WORKING_WEBVIEW_VERSION_CODE = 418306960L
+
+/** The minimum supported Webview version(Human readable). */
+internal const val OLDEST_WORKING_WEBVIEW_VERSION = 85
 
 /**
  * Shows a dialog if the current WebView version is older than the last supported version.
  */
-fun checkWebviewVersion(activity: AnkiActivity): Boolean {
-    val userVisibleCode = getChromeLikeWebViewVersionIfOutdated(activity) ?: return false
+
+context(context: Context)
+fun showDialogIfWebViewOutdated(
+    minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION,
+    onOutdated: () -> Unit = {},
+): Boolean {
+    val userVisibleCode = getChromeLikeWebViewVersionIfOutdated(context, minimumWebViewVersion) ?: return false
 
     // Provide guidance to the user if the WebView is outdated
-    val webviewPackageInfo = getAndroidSystemWebViewPackageInfo(activity.packageManager)
-    val legacyWebViewPackageInfo = getLegacyWebViewPackageInfo(activity.packageManager)
+    val webviewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context)
+    val legacyWebViewPackageInfo = getLegacyWebViewPackageInfo(context.packageManager)
     // TODO modify the alert dialog text to handle the usage of developer builds for system WebView
     if (legacyWebViewPackageInfo != null) {
         Timber.w("WebView is outdated. %s: %s", legacyWebViewPackageInfo.packageName, legacyWebViewPackageInfo.versionName)
-        showOutdatedWebViewDialog(activity, userVisibleCode, R.string.link_legacy_webview_update)
+        showOutdatedWebViewDialog(context, userVisibleCode, R.string.link_legacy_webview_update, onOutdated)
     } else {
         Timber.w("WebView is outdated. %s: %s", webviewPackageInfo?.packageName, webviewPackageInfo?.versionName)
-        showOutdatedWebViewDialog(activity, userVisibleCode, R.string.link_webview_update)
+        showOutdatedWebViewDialog(context, userVisibleCode, R.string.link_webview_update, onOutdated)
     }
     return true
 }
@@ -78,16 +86,25 @@ fun getWebviewUserAgent(context: Context): String? {
  * Returns a Chrome-like WebView version if it is outdated, otherwise null if
  * cannot be determined at all or if okay
  */
-private fun getChromeLikeWebViewVersionIfOutdated(activity: AnkiActivity): Int? {
+private fun getChromeLikeWebViewVersionIfOutdated(
+    context: Context,
+    minimumWebViewVersion: Int,
+): Int? {
     // If we cannot get the package information at all, return null
-    val webviewPackageInfo = getAndroidSystemWebViewPackageInfo(activity.packageManager) ?: return null
+    val webviewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context) ?: return null
     val webviewVersion =
         webviewPackageInfo.versionName ?: run {
             Timber.w("Failed to obtain WebView version")
             return null
         }
     val versionCode = PackageInfoCompat.getLongVersionCode(webviewPackageInfo)
-    return checkWebViewVersionComponents(webviewPackageInfo.packageName, webviewVersion, versionCode, getWebviewUserAgent(activity))
+    return checkWebViewVersionComponents(
+        webviewPackageInfo.packageName,
+        webviewVersion,
+        versionCode,
+        getWebviewUserAgent(context),
+        minimumWebViewVersion,
+    )
 }
 
 @VisibleForTesting
@@ -96,6 +113,7 @@ fun checkWebViewVersionComponents(
     webviewVersion: String,
     versionCode: Long,
     userAgent: String?,
+    minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION,
 ): Int? {
     // Sometimes the webview version code appears too old, and the package name does as well,
     // but it's a webview that advertises modern capabilities via User-Agent in "Chrome" section
@@ -104,7 +122,7 @@ fun checkWebViewVersionComponents(
         val chromeRegex = """Chrome/(\d+)""".toRegex()
         val matchResult = chromeRegex.find(userAgent)?.groupValues?.get(1)
         matchResult?.toInt()?.let {
-            if (it >= OLDEST_WORKING_WEBVIEW_VERSION) {
+            if (it >= minimumWebViewVersion) {
                 // If the User-Agent says we are modern, trust it and skip further checks.
                 return null
             } else {
@@ -154,15 +172,17 @@ suspend fun getWebViewInfo(context: Context): WebViewInfo =
     }
 
 private fun showOutdatedWebViewDialog(
-    activity: AnkiActivity,
+    context: Context,
     installedVersion: Int,
     @StringRes learnMoreUrl: Int,
+    onDismiss: () -> Unit = {},
 ) {
-    AlertDialog.Builder(activity).show {
-        setMessage(activity.getString(R.string.webview_update_message, installedVersion, OLDEST_WORKING_WEBVIEW_VERSION))
+    AlertDialog.Builder(context).show {
+        setMessage(context.getString(R.string.webview_update_message, installedVersion, OLDEST_WORKING_WEBVIEW_VERSION))
         setPositiveButton(R.string.scoped_storage_learn_more) { _, _ ->
-            activity.openUrl(learnMoreUrl)
+            context.openUrl(learnMoreUrl)
         }
+        setOnDismissListener { onDismiss() }
     }
 }
 
@@ -173,26 +193,6 @@ private fun getLegacyWebViewPackageInfo(packageManager: PackageManager): Package
         null
     }
 
-/**
- * Returns a [PackageInfo] from the current system WebView, or `null` if unavailable
- */
-private fun getAndroidSystemWebViewPackageInfo(packageManager: PackageManager): PackageInfo? {
-    fun getPackage(packageName: String): PackageInfo? =
-        try {
-            packageManager.getPackageInfo(packageName, 0)
-        } catch (_: PackageManager.NameNotFoundException) {
-            null
-        }
-
-    // The WebView is called com.android.webview by default.
-    // Partner devices which ship with Google applications ship the Google-specific version
-    // of the WebView called com.google.android.webview.
-    // https://issues.chromium.org/issues/40419837#comment10
-
-    return getPackage("com.google.android.webview")
-        ?: getPackage("com.android.webview") // com.android.webview is used on API 24
-}
-
 /**
  * Enables debugging of web contents (HTML / CSS / JavaScript)
  * loaded into any WebViews of this application. This flag can be enabled

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

@@ -56,26 +56,14 @@ class WebViewUtilsTest {
             equalTo(null),
         )
         assertThat(
-            "Should catch old engine (78) in Huawei package even with valid versionCode",
+            "Known old huawei webview determined correctly",
             checkWebViewVersionComponents(
                 "com.huawei.webview",
-                "12.1.2.322",
-                450000000L,
+                "unknown",
+                356L,
                 "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),
-        )
     }
 }