refactor: use WebViewVersion and WebViewVersionCode value classes and use finish() in PageFragement.kt

Author: Fandroid745

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

@@ -26,14 +26,15 @@ import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
 import com.ichi2.utils.OLDEST_WORKING_WEBVIEW_VERSION
+import com.ichi2.utils.WebViewVersion
 
 class AnkiPackageImporterFragment : PageFragment() {
     override val pagePath: String by lazy {
         val filePath = requireArguments().getString(KEY_FILE_PATH)
         "import-anki-package$filePath"
     }
 
-    override val minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION
+    override val minimumWebViewVersion: WebViewVersion = 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

@@ -28,6 +28,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
 import com.ichi2.utils.OLDEST_WORKING_WEBVIEW_VERSION
+import com.ichi2.utils.WebViewVersion
 
 /**
  * Anki page used to import text/csv files
@@ -38,7 +39,7 @@ class CsvImporter : PageFragment() {
         "import-csv$filePath"
     }
 
-    override val minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION
+    override val minimumWebViewVersion: WebViewVersion = 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,6 +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.WebViewVersion
 import com.ichi2.utils.showDialogIfWebViewOutdated
 import timber.log.Timber
 
@@ -66,7 +67,7 @@ abstract class PageFragment(
 
     protected open fun onWebViewCreated() { }
 
-    protected open val minimumWebViewVersion: Int? = null
+    protected open val minimumWebViewVersion: WebViewVersion? = null
 
     /**
      * When the webview calls `BridgeCommand("foo")`, the PageFragment execute `bridgeCommands["foo"]`.
@@ -113,7 +114,7 @@ abstract class PageFragment(
         if (minVersion != null &&
             with(ankiActivity) {
                 showDialogIfWebViewOutdated(minVersion) {
-                    ankiActivity.onBackPressedDispatcher.onBackPressed()
+                    ankiActivity.finish()
                 }
             }
         ) {

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

@@ -34,19 +34,29 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
+@JvmInline
+value class WebViewVersion(
+    val value: Int,
+)
+
+@JvmInline
+value class WebViewVersionCode(
+    val value: Long,
+)
+
 /** The Android package version code which corresponds to the Webview version. */
-internal const val OLDEST_WORKING_WEBVIEW_VERSION_CODE = 418306960L
+internal val OLDEST_WORKING_WEBVIEW_VERSION_CODE = WebViewVersionCode(418306960L)
 
 /** The minimum supported Webview version(Human readable). */
-internal const val OLDEST_WORKING_WEBVIEW_VERSION = 85
+internal val OLDEST_WORKING_WEBVIEW_VERSION = WebViewVersion(85)
 
 /**
  * Shows a dialog if the current WebView version is older than the last supported version.
  */
 
 context(context: Context)
 fun showDialogIfWebViewOutdated(
-    minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION,
+    minimumWebViewVersion: WebViewVersion = OLDEST_WORKING_WEBVIEW_VERSION,
     onOutdated: () -> Unit = {},
 ): Boolean {
     val userVisibleCode = getChromeLikeWebViewVersionIfOutdated(context, minimumWebViewVersion) ?: return false
@@ -88,7 +98,7 @@ fun getWebviewUserAgent(context: Context): String? {
  */
 private fun getChromeLikeWebViewVersionIfOutdated(
     context: Context,
-    minimumWebViewVersion: Int,
+    minimumWebViewVersion: WebViewVersion,
 ): Int? {
     // If we cannot get the package information at all, return null
     val webviewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context) ?: return null
@@ -113,7 +123,7 @@ fun checkWebViewVersionComponents(
     webviewVersion: String,
     versionCode: Long,
     userAgent: String?,
-    minimumWebViewVersion: Int = OLDEST_WORKING_WEBVIEW_VERSION,
+    minimumWebViewVersion: WebViewVersion = 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
@@ -122,7 +132,7 @@ fun checkWebViewVersionComponents(
         val chromeRegex = """Chrome/(\d+)""".toRegex()
         val matchResult = chromeRegex.find(userAgent)?.groupValues?.get(1)
         matchResult?.toInt()?.let {
-            if (it >= minimumWebViewVersion) {
+            if (it >= minimumWebViewVersion.value) {
                 // If the User-Agent says we are modern, trust it and skip further checks.
                 return null
             } else {
@@ -132,7 +142,7 @@ fun checkWebViewVersionComponents(
         }
     }
     // Checking the version code works for most webview packages
-    if (versionCode >= OLDEST_WORKING_WEBVIEW_VERSION_CODE) {
+    if (versionCode >= OLDEST_WORKING_WEBVIEW_VERSION_CODE.value) {
         Timber.d(
             "WebView is up to date. %s: %s(%s)",
             packageName,
@@ -178,7 +188,7 @@ private fun showOutdatedWebViewDialog(
     onDismiss: () -> Unit = {},
 ) {
     AlertDialog.Builder(context).show {
-        setMessage(context.getString(R.string.webview_update_message, installedVersion, OLDEST_WORKING_WEBVIEW_VERSION))
+        setMessage(context.getString(R.string.webview_update_message, installedVersion, OLDEST_WORKING_WEBVIEW_VERSION.value))
         setPositiveButton(R.string.scoped_storage_learn_more) { _, _ ->
             context.openUrl(learnMoreUrl)
         }

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

@@ -28,7 +28,7 @@ class WebViewUtilsTest {
             checkWebViewVersionComponents(
                 "com.google.android.webview",
                 "53.0.2785.124",
-                OLDEST_WORKING_WEBVIEW_VERSION_CODE - 1,
+                OLDEST_WORKING_WEBVIEW_VERSION_CODE.value - 1,
                 "Mozilla/5.0 (Linux; Android 7.0; Android SDK built for arm64 Build/NYC; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.124 Mobile Safari/537.36",
             ),
             equalTo(53),
@@ -50,7 +50,7 @@ class WebViewUtilsTest {
             checkWebViewVersionComponents(
                 "com.google.android.webview",
                 "74.0.0.0",
-                OLDEST_WORKING_WEBVIEW_VERSION_CODE - 1,
+                OLDEST_WORKING_WEBVIEW_VERSION_CODE.value - 1,
                 "Mozilla/5.0 (Linux; Android 9; SM-A730F Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.102 Mobile Safari/537.36",
             ),
             equalTo(null),