Photo Picker dialog: Show the dialog when image types are being requested.

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.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.webkit.MimeTypeMap;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.MainDex;
@@ skipping 213 matching lines @@
         if (extraIntents.isEmpty()) {
             // We couldn't resolve an accept type, so fallback to a generic chooser.
             getContentIntent.setType(ANY_TYPES);
             if (camera != null) extraIntents.add(camera);
             if (camcorder != null) extraIntents.add(camcorder);
             if (soundRecorder != null) extraIntents.add(soundRecorder);
         }
 
         // Use new photo picker, if available.
         Activity activity = mWindowAndroid.getActivity().get();
-        if (activity != null && UiUtils.showPhotoPicker(activity, this, mAllowMultiple)) {
+        if (activity != null && usePhotoPicker()

[Ted C, 2017/05/26 20:21:14]

Could usePhotoPicker() be:

TextUtils.equals(getContentIntent.getType(), ALL_IMAGE_TYPES) &&
!captureCamera()

I wonder if the block with noSpecificType() is doing what we want above.  Or
maybe we would want to set a boolean in the shouldShowImageTypes() branch above.
 That "seems" what we want.

[Finnur, 2017/05/29 15:18:36]

I don't see how that can work. 

There's two ways to specify images in HTML: with MIME types (image/jpg) or with
Extensions (.jpg).

Lets take an example, where I specify both, as in: "image/jpg,*.gif".

noSpecificType() would in that case return true, which makes the branch point at
line 225 above skip lines 226-242, causing getContentIntent to have type */*,
and the photo picker wouldn't be shown.

I do however, think that this code belongs above all the code that constructs a
getContentIntent, so I have moved it higher up (and the UMA to the top, above
the early returns).

Also added a test.

[Ted C, 2017/05/30 04:20:52]

If that is the case, then I'd argue the previous/existing behavior was wrong. 
With
the example you showed, shouldn't shouldShowImageTypes() return true (not
in the current form, but conceptually)?

It seems odd to me to have two methods that check the same thing.  Especially
if the existing Android photo picker would handle your example correctly (
filtering to just those file formats).

I don't know if it needs to block this anymore, but it seems that we should
reconcile this and explain the difference.

[Finnur, 2017/05/30 11:16:10]

I tend to agree with you. I suspect the previous behavior is wrong, but am not
100% sure. But yeah, we should reconcile this.

+                && UiUtils.showPhotoPicker(activity, this, mAllowMultiple)) {
             return;
         }
 
         Intent chooser = new Intent(Intent.ACTION_CHOOSER);
         if (!extraIntents.isEmpty()) {
             chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS,
                     extraIntents.toArray(new Intent[] { }));
         }
         chooser.putExtra(Intent.EXTRA_INTENT, getContentIntent);
 
         if (!mWindowAndroid.showIntent(chooser, this, R.string.low_memory_error)) {
             onFileNotSelected();
         }
     }
 
+    /**
+     * Determines if a photo picker can be used instead of the stock Android picker.
+     * @return True if only images types are being requested.
+     *

[Ted C, 2017/05/26 20:21:14]

remove extra blank line

[Finnur, 2017/05/29 15:18:36]

Done.

+     */
+    private boolean usePhotoPicker() {
+        boolean usePhotoPicker = false;
+        for (String type : mFileTypes) {
+            String mimeType;
+            if (type.startsWith(".")) {
+                String extension = type.substring(1, type.length());
+                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+            } else {
+                mimeType = type;
+            }
+            usePhotoPicker = mimeType != null && mimeType.startsWith("image/");
+        }
+        return usePhotoPicker;
+    }
+
     @Override
     public void onPickerUserAction(Action action, String[] photos) {
         UiUtils.dismissPhotoPicker();
 
         switch (action) {
             case CANCEL:
                 onFileNotSelected();
                 break;
 
             case PHOTOS_SELECTED:
@@ skipping 372 matching lines @@
     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);
 }