Allow <input type="file" multiple /> to be used on Android JB MR2+.

ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.ui.base;
 
 import android.app.Activity;
+import android.content.ClipData;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
@@ skipping 25 matching lines @@
     private Uri mCameraOutputUri;
 
     private SelectFileDialog(long nativeSelectFileDialog) {
         mNativeSelectFileDialog = nativeSelectFileDialog;
     }
 
     /**
      * Creates and starts an intent based on the passed fileTypes and capture value.
      * @param fileTypes MIME types requested (i.e. "image/*")
      * @param capture The capture value as described in http://www.w3.org/TR/html-media-capture/
+     * @param multiple Whether it should be possible to select multiple files.
      * @param window The WindowAndroid that can show intents
      */
     @CalledByNative
-    private void selectFile(String[] fileTypes, boolean capture, WindowAndroid window) {
+    private void selectFile(
+            String[] fileTypes, boolean capture, boolean multiple, WindowAndroid window) {
         mFileTypes = new ArrayList<String>(Arrays.asList(fileTypes));
         mCapture = capture;
 
         Intent chooser = new Intent(Intent.ACTION_CHOOSER);
         Intent camera = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         mCameraOutputUri = Uri.fromFile(getFileForImageCapture());
         camera.putExtra(MediaStore.EXTRA_OUTPUT, mCameraOutputUri);
         Intent camcorder = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
         Intent soundRecorder = new Intent(
                 MediaStore.Audio.Media.RECORD_SOUND_ACTION);
 
         // Quick check - if the |capture| parameter is set and |fileTypes| has the appropriate MIME
         // type, we should just launch the appropriate intent. Otherwise build up a chooser based on
         // the accept type and then display that to the user.
         if (captureCamera()) {
             if (window.showIntent(camera, this, R.string.low_memory_error)) return;
         } else if (captureCamcorder()) {
             if (window.showIntent(camcorder, this, R.string.low_memory_error)) return;
         } else if (captureMicrophone()) {
             if (window.showIntent(soundRecorder, this, R.string.low_memory_error)) return;
         }
 
         Intent getContentIntent = new Intent(Intent.ACTION_GET_CONTENT);
         getContentIntent.addCategory(Intent.CATEGORY_OPENABLE);
+
+        if (multiple)
+            getContentIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+
         ArrayList<Intent> extraIntents = new ArrayList<Intent>();
         if (!noSpecificType()) {
             // Create a chooser based on the accept type that was specified in the webpage. Note
             // that if the web page specified multiple accept types, we will have built a generic
             // chooser above.
             if (shouldShowImageTypes()) {
                 extraIntents.add(camera);
                 getContentIntent.setType(ALL_IMAGE_TYPES);
             } else if (shouldShowVideoTypes()) {
                 extraIntents.add(camcorder);
@@ skipping 85 matching lines @@
             nativeOnFileSelected(mNativeSelectFileDialog, mCameraOutputUri.getPath(), "");
 
             // Broadcast to the media scanner that there's a new photo on the device so it will
             // show up right away in the gallery (rather than waiting until the next time the media
             // scanner runs).
             window.sendBroadcast(new Intent(
                     Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, mCameraOutputUri));
             return;
         }
 
+        // Path for when EXTRA_ALLOW_MULTIPLE Intent extra has been defined. Each of the selected
+        // files will be shared as an entry on the Intent's ClipData.
+        if (results.getData() == null && results.getClipData() != null) {

[Miguel Garcia, 2014/08/05 18:01:00]

can you check that the |results| intent in fact contains the
EXTRA_ALLOW_MULTIPLE parameter?

[Peter Beverloo, 2014/08/05 18:44:53]

|results| is the resulting Intent, not the contentIntent we establish earlier
on. I did add the JB MR2+ check per your other comment.

+            ClipData clipData = results.getClipData();
+
+            int itemCount = clipData.getItemCount();
+            if (itemCount == 0) {
+                onFileNotSelected();
+                return;
+            }
+
+            String[] filePathArray = new String[itemCount];
+            String[] displayNameArray = new String[itemCount];
+
+            for (int i = 0; i < itemCount; ++i) {
+                final Uri uri = clipData.getItemAt(i).getUri();
+
+                filePathArray[i] = uri.toString();
+                displayNameArray[i] = resolveFileName(uri, contentResolver);
+            }
+
+            nativeOnMultipleFilesSelected(mNativeSelectFileDialog,
+                    filePathArray, displayNameArray);
+            return;
+        }
+
         if (ContentResolver.SCHEME_FILE.equals(results.getData().getScheme())) {
             nativeOnFileSelected(mNativeSelectFileDialog,
                     results.getData().getSchemeSpecificPart(), "");
             return;
         }
 
         if (ContentResolver.SCHEME_CONTENT.equals(results.getScheme())) {
             nativeOnFileSelected(mNativeSelectFileDialog,
                                  results.getData().toString(),
                                  resolveFileName(results.getData(),
@@ skipping 59 matching lines @@
         return false;
     }
 
     @CalledByNative
     private static SelectFileDialog create(long nativeSelectFileDialog) {
         return new SelectFileDialog(nativeSelectFileDialog);
     }
 
     private native void nativeOnFileSelected(long nativeSelectFileDialogImpl,
             String filePath, String displayName);
+    private native void nativeOnMultipleFilesSelected(long nativeSelectFileDialogImpl,
+            String[] filePathArray, String[] displayNameArray);
     private native void nativeOnFileNotSelected(long nativeSelectFileDialogImpl);
 }