Allow file: uris for <file> input types

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

 // Copyright (c) 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;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.database.Cursor;
@@ skipping 126 matching lines @@
      * @param contentResolver The content resolver used to extract the path of the selected file.
      * @param results The results of the requested intent.
      */
     @Override
     public void onIntentCompleted(WindowAndroid window, int resultCode,
             ContentResolver contentResolver, Intent results) {
         if (resultCode != Activity.RESULT_OK) {
             onFileNotSelected();
             return;
         }
-        boolean success = false;
+
         if (results == null) {
             // If we have a successful return but no data, then assume this is the camera returning
             // the photo that we requested.
             nativeOnFileSelected(mNativeSelectFileDialog, mCameraOutputUri.getPath());
-            success = true;
 
             // 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));
-        } else {
+            return;
+        }
+
+        if ("file".equals(results.getData().getScheme())) {

[aurimas (slooooooooow), 2013/11/05 20:52:07]

Should pull "file" out as a constant.

[Miguel Garcia, 2013/11/06 18:07:51]

Really? In this case it just seems an overkill. I was looking if the constant
was officially defined somewhere else but couldn't not find it.

[Ted C, 2013/11/08 17:00:13]

I hit this same issue anytime I want to check against http or https, there
doesn't seem to be constants anywhere and almost all usages are inlined.  I
don't necessarily like it, but it's consistent which is often more important.

[Miguel Garcia, 2013/11/09 07:09:08]

Ok, will leave it as is then.

On 2013/11/08 17:00:13, Ted C wrote:

+            nativeOnFileSelected(mNativeSelectFileDialog,
+                    results.getData().getSchemeSpecificPart());
+            return;
+        }
+
+        Cursor cursor = null;
+        try {
             // We get back a content:// URI from the system if the user picked a file from the
             // gallery. The ContentView has functionality that will convert that content:// URI to
             // a file path on disk that Chromium understands.
-            Cursor c = contentResolver.query(results.getData(),
+            cursor = contentResolver.query(results.getData(),
                     new String[] { MediaStore.MediaColumns.DATA }, null, null, null);
-            if (c != null) {
-                if (c.getCount() == 1) {
-                    c.moveToFirst();
-                    String path = c.getString(0);
+            if (cursor != null) {
+                if (cursor.getCount() == 1) {
+                    cursor.moveToFirst();
+                    String path = cursor.getString(0);
                     if (path != null) {
                         // Not all providers support the MediaStore.DATA column. For example,
                         // Gallery3D (com.android.gallery3d.provider) does not support it for
                         // Picasa Web Album images.
                         nativeOnFileSelected(mNativeSelectFileDialog, path);
-                        success = true;
+                        return;
                     }
                 }
-                c.close();
+            }
+        } finally {
+            if (cursor != null) {
+                cursor.close();

[Ted C, 2013/11/08 17:00:13]

this could all fit on one line

[Miguel Garcia, 2013/11/09 07:09:08]

Done.

             }
         }
-        if (!success) {
-            onFileNotSelected();
-            window.showError(R.string.opening_file_error);
-        }
+
+        onFileNotSelected();
+        window.showError(R.string.opening_file_error);
     }
 
     private void onFileNotSelected() {
         nativeOnFileNotSelected(mNativeSelectFileDialog);
     }
 
     private boolean noSpecificType() {
         // We use a single Intent to decide the type of the file chooser we display to the user,
         // which means we can only give it a single type. If there are multiple accept types
         // specified, we will fallback to a generic chooser (unless a capture parameter has been
@@ skipping 45 matching lines @@
 
     @CalledByNative
     private static SelectFileDialog create(int nativeSelectFileDialog) {
         return new SelectFileDialog(nativeSelectFileDialog);
     }
 
     private native void nativeOnFileSelected(int nativeSelectFileDialogImpl,
             String filePath);
     private native void nativeOnFileNotSelected(int nativeSelectFileDialogImpl);
 }