Refactor WebMessage listener setup for FS streams

Replaced direct usage of WebViewCompat.addWebMessageListener with a new createWebMessageListener extension for cleaner and more reusable listener setup in FsStreams. Introduced WebMessageListenerScope data class to encapsulate listener parameters and improve code readability.

Author: DerGoogler

plugin/src/main/kotlin/dev/mmrl/internal/FsStreams.kt

@@ -1,10 +1,12 @@
 package dev.mmrl.internal
 
+import android.R.id.message
 import androidx.webkit.WebMessageCompat
 import androidx.webkit.WebViewCompat
 import androidx.webkit.WebViewFeature
 import com.dergoogler.mmrl.platform.file.SuFile
 import com.dergoogler.mmrl.webui.interfaces.WXInterface
+import dev.mmrl.util.createWebMessageListener
 
 
 private val WXInterface.isFsInputStreamAllowed: Boolean get() = "wxu.permission.FS_INPUT_STREAM" in config.permissions
@@ -15,23 +17,19 @@ fun WXInterface.initFsInputStream() {
         return
     }
 
-    WebViewCompat.addWebMessageListener(
-        webView,
-        "FsInputStream",
-        setOf("*")
-    ) { view, message, sourceOrigin, isMainFrame, reply ->
+    createWebMessageListener("FsInputStream") fis@{
         val data: String? = message.data
 
         if (data == null) {
             reply.postMessage("Failed! Data was null.")
-            return@addWebMessageListener
+            return@fis
         }
 
         val file = SuFile(message.data)
 
         if (!file.exists()) {
             reply.postMessage("Failed! File does not exist.")
-            return@addWebMessageListener
+            return@fis
         }
 
         when (message.type) {
@@ -60,19 +58,14 @@ fun WXInterface.initFsOutputStream() {
 
     var currentPath: String? = null
 
-    WebViewCompat.addWebMessageListener(
-        webView,
-        "FsOutputStream",
-        setOf("*")
-    ) { view, message, sourceOrigin, isMainFrame, reply ->
-
+    createWebMessageListener("FsOutputStream") ops@{
         when (message.type) {
             WebMessageCompat.TYPE_STRING -> {
                 // Initialize the file path
                 currentPath = message.data
                 if (currentPath == null) {
                     reply.postMessage("Failed! Path was null.")
-                    return@addWebMessageListener
+                    return@ops
                 }
 
                 val file = SuFile(currentPath)
@@ -81,7 +74,7 @@ fun WXInterface.initFsOutputStream() {
                         file.createNewFile()
                     } catch (e: Exception) {
                         reply.postMessage("Failed to create file: ${e.message}")
-                        return@addWebMessageListener
+                        return@ops
                     }
                 }
 
@@ -91,7 +84,7 @@ fun WXInterface.initFsOutputStream() {
             WebMessageCompat.TYPE_ARRAY_BUFFER -> {
                 if (currentPath == null) {
                     reply.postMessage("Failed! Path not set before sending chunk.")
-                    return@addWebMessageListener
+                    return@ops
                 }
 
                 try {

plugin/src/main/kotlin/dev/mmrl/util/Extensions.kt

@@ -1,16 +1,24 @@
 package dev.mmrl.util
 
-import android.R.id.input
+import android.R.attr.data
+import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.util.Base64
+import android.webkit.WebMessage
+import androidx.annotation.RequiresFeature
+import androidx.annotation.UiThread
 import androidx.core.graphics.createBitmap
+import androidx.webkit.JavaScriptReplyProxy
+import androidx.webkit.WebMessageCompat
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
+import com.dergoogler.mmrl.webui.interfaces.WXInterface
 import com.dergoogler.mmrl.webui.moshi
 import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.io.InputStream
 
 
 fun <T> List<T>?.toJsonString(): String {
@@ -51,4 +59,30 @@ inline fun <reified T> Map<String, Any?>?.getProp(key: String, def: T): T {
     } else {
         def
     }
+}
+
+data class WebMessageListenerScope(
+    private val wx: WXInterface,
+    val message: WebMessageCompat,
+    val reply: JavaScriptReplyProxy,
+    val sourceOrigin: Uri,
+    val isMainFrame: Boolean,
+)
+
+@UiThread
+@SuppressLint("RequiresFeature")
+@RequiresFeature(
+    name = WebViewFeature.WEB_MESSAGE_LISTENER,
+    enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported"
+)
+fun WXInterface.createWebMessageListener(
+    jsObjectName: String,
+    allowedOriginRules: Set<String> = setOf(options.domain.toString()),
+    block: WebMessageListenerScope.() -> Unit,
+) = WebViewCompat.addWebMessageListener(
+    webView,
+    jsObjectName,
+    allowedOriginRules
+) { _, message, uri, isMainFrame, reply ->
+    block(WebMessageListenerScope(this, message, reply, uri, isMainFrame))
 }