fix: Web debugging not working

this fixes:
1. web debugging not working on all the web screens immediately after the setting is changed (the user needed to open the reviewer for that)
2. web debugging not working on release builds on the new study screen

Author: BrayanDSO

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

@@ -163,7 +163,6 @@ import com.ichi2.ui.FixedEditText
 import com.ichi2.utils.HandlerUtils.newHandler
 import com.ichi2.utils.HashUtil.hashSetInit
 import com.ichi2.utils.Stopwatch
-import com.ichi2.utils.WebViewDebugging.initializeDebugging
 import com.ichi2.utils.message
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
@@ -1269,7 +1268,6 @@ abstract class AbstractFlashcardViewer :
     protected open fun recreateWebView() {
         if (webView == null) {
             webView = createWebView()
-            initializeDebugging(this.sharedPrefs())
             cardFrame!!.addView(webView)
             gestureDetectorImpl.onWebViewCreated(webView!!)
         }

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

@@ -28,8 +28,8 @@ import android.os.Bundle
 import android.os.Environment
 import android.system.Os
 import android.webkit.CookieManager
+import android.webkit.WebView
 import androidx.annotation.VisibleForTesting
-import androidx.core.content.edit
 import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.MutableLiveData
@@ -40,7 +40,6 @@ import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
 import com.ichi2.anki.common.annotations.LegacyNotifications
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
-import com.ichi2.anki.common.utils.isRunningAsUnitTest
 import com.ichi2.anki.contextmenu.AnkiCardContextMenu
 import com.ichi2.anki.contextmenu.CardBrowserContextMenu
 import com.ichi2.anki.exception.StorageAccessException
@@ -163,10 +162,8 @@ open class AnkiDroidApp :
             showThemedToast(this.applicationContext, getString(R.string.user_is_a_robot), false)
         }
 
-        // make default HTML / JS debugging true for debug build and disable for unit/android tests
-        if (BuildConfig.DEBUG && !isRunningAsUnitTest) {
-            preferences.edit { putBoolean("html_javascript_debugging", true) }
-        }
+        WebView.setWebContentsDebuggingEnabled(Prefs.isWebDebugEnabled)
+
         CardBrowserContextMenu.ensureConsistentStateWithPreferenceStatus(
             this,
             preferences.getBoolean(

AnkiDroid/src/main/java/com/ichi2/anki/preferences/DevOptionsFragment.kt

@@ -15,6 +15,7 @@
  */
 package com.ichi2.anki.preferences
 
+import android.webkit.WebView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.edit
@@ -190,6 +191,17 @@ class DevOptionsFragment : SettingsFragment() {
             ActivityCompat.recreate(requireActivity())
             true
         }
+
+        setupWebDebugPreference()
+    }
+
+    private fun setupWebDebugPreference() {
+        requirePreference<SwitchPreferenceCompat>(R.string.html_javascript_debugging_key).apply {
+            isVisible = !BuildConfig.DEBUG
+            setOnPreferenceChangeListener { isEnabled ->
+                WebView.setWebContentsDebuggingEnabled(isEnabled)
+            }
+        }
     }
 
     /**

AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt

@@ -23,6 +23,7 @@ import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.BuildConfig
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.TapGestureMode
+import com.ichi2.anki.common.utils.isRunningAsUnitTest
 import com.ichi2.anki.settings.enums.FrameStyle
 import com.ichi2.anki.settings.enums.HideSystemBars
 import com.ichi2.anki.settings.enums.PrefEnum
@@ -295,6 +296,9 @@ object Prefs {
 
     val devUsingCardBrowserSearchView: Boolean by booleanPref(R.string.dev_card_browser_search_view, false)
 
+    val isWebDebugEnabled: Boolean
+        get() = (getBoolean(R.string.html_javascript_debugging_key, false) || BuildConfig.DEBUG) && !isRunningAsUnitTest
+
     // **************************************** UI Config *************************************** //
 
     private const val UI_CONFIG_PREFERENCES_NAME = "ui-config"

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

@@ -16,29 +16,13 @@
 
 package com.ichi2.utils
 
-import android.content.SharedPreferences
 import android.os.Build
 import android.webkit.WebView
 import androidx.annotation.RequiresApi
-import androidx.annotation.UiThread
 
 object WebViewDebugging {
     private var sHasSetDataDirectory = false
 
-    @UiThread
-    fun initializeDebugging(sharedPrefs: SharedPreferences) {
-        // DEFECT: We might be able to cache this value: check what happens on WebView Renderer crash
-        // On your desktop use chrome://inspect to connect to emulator WebViews
-        // Beware: Crash in AnkiDroidApp.onCreate() with:
-        //
-        //     java.lang.RuntimeException: Using WebView from more than one process at once with the same data directory
-        //     is not supported. https://crbug.com/558377 : Lock owner com.ichi2.anki:acra at
-        //     org.chromium.android_webview.AwDataDirLock.a(PG:26)
-        //
-        val enableDebugging = sharedPrefs.getBoolean("html_javascript_debugging", false)
-        WebView.setWebContentsDebuggingEnabled(enableDebugging)
-    }
-
     /** Throws IllegalStateException if a WebView has been initialized  */
     @RequiresApi(api = Build.VERSION_CODES.P)
     fun setDataDirectorySuffix(suffix: String) {