fix: Android browser component now works with multi-file selection. (#…

…3788) Ticket: #3787
codenameone · Feb 25, 2024 · d6000a5 · d6000a5
1 parent 7126a57
commit d6000a5
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java b/Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java
@@ -7982,10 +7982,29 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (requestCode == REQUEST_SELECT_FILE || requestCode == FILECHOOSER_RESULTCODE) {
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 if (requestCode == REQUEST_SELECT_FILE) {
-                    if (uploadMessage == null) {
-                        return;
+                    if (uploadMessage == null) return;
+                    Uri[] results = null;
+
+                    // Check that the response is a good one
+                    if (resultCode == Activity.RESULT_OK) {
+                        if (intent != null) {
+                            // If there is not data, then we may have taken a photo
+                            String dataString = intent.getDataString();
+                            ClipData clipData = intent.getClipData();
+
+                            if (clipData != null) {
+                                results = new Uri[clipData.getItemCount()];
+                                for (int i = 0; i < clipData.getItemCount(); i++) {
+                                    ClipData.Item item = clipData.getItemAt(i);
+                                    results[i] = item.getUri();
+                                }
+                            } else if (dataString != null) {
+                                results = new Uri[]{Uri.parse(dataString)};
+                            }
+                        }
                     }
-                    uploadMessage.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, intent));
+
+                    uploadMessage.onReceiveValue(results);
                     uploadMessage = null;
                 }
             }