fix: address issues with file uploads

Author: mrepol742

app/src/main/java/com/mrepol742/webappp/MainActivity.kt

@@ -6,12 +6,14 @@ import android.webkit.WebView
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
+import com.mrepol742.webappp.client.SecureChromeClient
 import com.mrepol742.webappp.ui.theme.WebApppTheme
 import com.mrepol742.webappp.utils.DynamicShortcut
 
@@ -27,6 +29,12 @@ class MainActivity : ComponentActivity() {
         "/contact-me" to "Contact Me",
     )
     private val webViewState = mutableStateOf<WebView?>(null)
+    private val secureWebChromeClientState = mutableStateOf<SecureChromeClient?>(null)
+
+    private val fileChooserLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            secureWebChromeClientState.value?.handleFileChosen(result.resultCode, result.data)
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -39,6 +47,8 @@ class MainActivity : ComponentActivity() {
                         allowedDomain = allowedDomain,
                         initialUrl = currentUrl,
                         webViewState = webViewState,
+                        secureWebChromeClientState = secureWebChromeClientState,
+                        fileChooserLauncher= fileChooserLauncher,
                         modifier = Modifier.padding(innerPadding)
                     )
                 }

app/src/main/java/com/mrepol742/webappp/WebViewScreen.kt

@@ -2,10 +2,12 @@ package com.mrepol742.webappp
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
 import android.util.Log
 import android.view.ViewGroup
 import android.webkit.WebView
 import androidx.activity.compose.BackHandler
+import androidx.activity.result.ActivityResultLauncher
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -23,7 +25,14 @@ import kotlinx.coroutines.delay
 
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
-fun WebViewScreen(allowedDomain: String, initialUrl: String, webViewState: MutableState<WebView?>, modifier: Modifier = Modifier) {
+fun WebViewScreen(
+    allowedDomain: String,
+    initialUrl: String,
+    webViewState: MutableState<WebView?>,
+    secureWebChromeClientState: MutableState<SecureChromeClient?>,
+    fileChooserLauncher: ActivityResultLauncher<Intent>,
+    modifier: Modifier = Modifier
+) {
 
     AndroidView(
         modifier = Modifier.fillMaxSize(),
@@ -64,7 +73,10 @@ fun WebViewScreen(allowedDomain: String, initialUrl: String, webViewState: Mutab
                 setLayerType(android.view.View.LAYER_TYPE_HARDWARE, null)
 
                 webViewClient = SecureWebViewClient(context, allowedDomain)
-                webChromeClient = SecureChromeClient(context as Activity)
+
+                val chromeClient = SecureChromeClient(context as Activity, fileChooserLauncher)
+                webChromeClient = chromeClient
+                secureWebChromeClientState.value = chromeClient
                 setDownloadListener(DownloadListener(context))
 
                 loadUrl(initialUrl)

app/src/main/java/com/mrepol742/webappp/client/SecureChromeClient.kt

@@ -12,28 +12,18 @@ import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.widget.FrameLayout
+import androidx.activity.result.ActivityResultLauncher
 
 class SecureChromeClient(
-    private val activity: Activity
+    private val activity: Activity,
+    private val fileChooserLauncher: ActivityResultLauncher<Intent>
 ) : WebChromeClient() {
 
     private var filePathCallback: ValueCallback<Array<Uri>>? = null
-    private val fileChooserRequestCode = 1001
     private var customView: View? = null
     private var customViewCallback: WebChromeClient.CustomViewCallback? = null
     private var fullScreenContainer: FrameLayout? = null
 
-    fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == fileChooserRequestCode) {
-            val result: Array<Uri>? = if (resultCode == Activity.RESULT_OK && data != null) {
-                data.data?.let { arrayOf(it) }
-            } else null
-
-            filePathCallback?.onReceiveValue(result)
-            filePathCallback = null
-        }
-    }
-
     override fun onShowFileChooser(
         webView: WebView?,
         filePathCallback: ValueCallback<Array<Uri>>,
@@ -42,16 +32,26 @@ class SecureChromeClient(
         this.filePathCallback?.onReceiveValue(null)
         this.filePathCallback = filePathCallback
 
-        val intent = fileChooserParams.createIntent()
         return try {
-            activity.startActivityForResult(intent, fileChooserRequestCode)
+            val intent = fileChooserParams.createIntent()
+            fileChooserLauncher.launch(intent) // ✅ modern way
             true
         } catch (e: Exception) {
             this.filePathCallback = null
             false
         }
     }
 
+    fun handleFileChosen(resultCode: Int, data: Intent?) {
+        val result: Array<Uri>? =
+            if (resultCode == Activity.RESULT_OK && data?.data != null) {
+                arrayOf(data.data!!)
+            } else null
+
+        filePathCallback?.onReceiveValue(result)
+        filePathCallback = null
+    }
+
     override fun onShowCustomView(view: View?, callback: CustomViewCallback?) {
         // If a view already exists, hide it first
         if (customView != null) {