feat: replace requiresModernWebView() with minimumWebViewVersion property

Author: Fandroid745

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()
         }