Add permission and console message handling to WXChromeClient

Introduces handling for onPermissionRequest and onConsoleMessage in WXChromeClient, allowing permission requests to be confirmed via dialog and console messages to be logged with appropriate log levels. Refactors the options invocation pattern for dialog handling and removes unused contract-related code.

Author: DerGoogler

webui/src/main/kotlin/com/dergoogler/mmrl/webui/client/WXChromeClient.kt

@@ -1,7 +1,10 @@
 package com.dergoogler.mmrl.webui.client
 
+import android.util.Log
+import android.webkit.ConsoleMessage
 import android.webkit.JsPromptResult
 import android.webkit.JsResult
+import android.webkit.PermissionRequest
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import com.dergoogler.mmrl.ui.component.dialog.ConfirmData
@@ -10,9 +13,6 @@ import com.dergoogler.mmrl.ui.component.dialog.confirm
 import com.dergoogler.mmrl.ui.component.dialog.prompt
 import com.dergoogler.mmrl.webui.R
 import com.dergoogler.mmrl.webui.util.WebUIOptions
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 
 open class WXChromeClient(
     private val options: WebUIOptions,
@@ -21,26 +21,12 @@ open class WXChromeClient(
         const val TAG = "WXChromeClient"
     }
 
-    @OptIn(ExperimentalContracts::class)
-    private inline fun options(
-        result: JsResult,
-        options: WebUIOptions,
-        block: WebUIOptions.() -> Unit,
-    ): Boolean {
-        contract {
-            callsInPlace(block, InvocationKind.AT_MOST_ONCE)
-        }
-
-        block(options)
-        return true
-    }
-
     override fun onJsAlert(
         view: WebView?,
         url: String,
         message: String,
         result: JsResult,
-    ): Boolean = options(result, options) {
+    ): Boolean = options {
         context.confirm(
             confirmData = ConfirmData(
                 title = context.getString(R.string.says, modId.id),
@@ -50,14 +36,16 @@ open class WXChromeClient(
             ),
             colorScheme = colorScheme
         )
+
+        true
     }
 
     override fun onJsConfirm(
         view: WebView,
         url: String,
         message: String,
         result: JsResult,
-    ): Boolean = options(result, options) {
+    ): Boolean = options {
         context.confirm(
             confirmData = ConfirmData(
                 title = context.getString(R.string.says, modId.id),
@@ -67,6 +55,8 @@ open class WXChromeClient(
             ),
             colorScheme = colorScheme
         )
+
+        true
     }
 
     override fun onJsPrompt(
@@ -75,7 +65,7 @@ open class WXChromeClient(
         message: String?,
         defaultValue: String?,
         result: JsPromptResult,
-    ): Boolean = options(result, options) {
+    ): Boolean = options {
         context.prompt(
             promptData = PromptData(
                 title = message ?: context.getString(R.string.says, modId.id),
@@ -85,6 +75,49 @@ open class WXChromeClient(
             ),
             colorScheme = colorScheme
         )
+
+        true
+    }
+
+    override fun onPermissionRequest(request: PermissionRequest) = options {
+        val perms = config.permissions
+        val filteredPermissions = perms.mapNotNull {
+            if (Regex("^android\\.webkit\\.resource\\.([A-Z_]+)$").matches(it)) {
+                return@mapNotNull it
+            } else null
+        }.toTypedArray()
+
+        if (filteredPermissions.isEmpty()) return@options
+
+        val p = filteredPermissions.joinToString("") { "\n- $it" }
+
+        context.confirm(
+            confirmData = ConfirmData(
+                title = context.getString(R.string.says, modId.id),
+                description = "Requesting permissions: $p",
+                onConfirm = { request.grant(filteredPermissions) },
+                onClose = { request.deny() }
+            ),
+            colorScheme = colorScheme
+        )
+    }
+
+    override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
+        val message = """
+            ${consoleMessage.message()}
+            Source: ${consoleMessage.sourceId()}
+            Line: ${consoleMessage.lineNumber()}
+            Level: ${consoleMessage.messageLevel()}
+        """.trimIndent()
+
+        when (consoleMessage.messageLevel()) {
+            ConsoleMessage.MessageLevel.TIP -> Log.i(TAG, message)
+            ConsoleMessage.MessageLevel.LOG -> Log.d(TAG, message)
+            ConsoleMessage.MessageLevel.WARNING -> Log.w(TAG, message)
+            ConsoleMessage.MessageLevel.ERROR -> Log.e(TAG, message)
+            else -> Log.v(TAG, message)
+        }
+        return true
     }
 }
 

webui/src/main/kotlin/com/dergoogler/mmrl/webui/util/rememberWebUIOptions.kt

@@ -306,6 +306,8 @@ data class WebUIOptions(
         result = 31 * result + colorScheme.hashCode()
         return result
     }
+
+    operator fun <R> invoke(block: WebUIOptions.() -> R): R = block()
 }
 
 fun WebUIOptions.drawCompose(