fix(android): handle input file when accept have file extensions (#1990)

ionic-team · Sep 24, 2019 · 9fc348a · 9fc348a
1 parent 52f083d
commit 9fc348a
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java b/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java
@@ -12,6 +12,7 @@
 import android.webkit.GeolocationPermissions;
 import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
+import android.webkit.MimeTypeMap;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
@@ -303,8 +304,8 @@ private void showFilePicker(final ValueCallback<Uri[]> filePathCallback, FileCho
       intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
     }
     if (fileChooserParams.getAcceptTypes().length > 1) {
-      intent.setType("*/*");
-      intent.putExtra(Intent.EXTRA_MIME_TYPES, fileChooserParams.getAcceptTypes());
+      String[] validTypes = getValidTypes(fileChooserParams.getAcceptTypes());
+      intent.putExtra(Intent.EXTRA_MIME_TYPES, validTypes);
     }
     try {
       bridge.cordovaInterface.startActivityForResult(new CordovaPlugin() {
@@ -329,6 +330,24 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
     }
   }
 
+  private String[] getValidTypes(String[] currentTypes) {
+    List<String> validTypes = new ArrayList<>();
+    MimeTypeMap mtm = MimeTypeMap.getSingleton();
+    for (String mime : currentTypes) {
+      if (mime.startsWith(".")) {
+        String extension = mime.substring(1);
+        String extensionMime = mtm.getMimeTypeFromExtension(extension);
+        if (extensionMime != null && !validTypes.contains(extensionMime)) {
+          validTypes.add(extensionMime);
+        }
+      } else if (!validTypes.contains(mime)) {
+        validTypes.add(mime);
+      }
+    }
+    Object[] validObj = validTypes.toArray();
+    return Arrays.copyOf(validObj, validObj.length, String[].class);
+  }
+
   @Override
   public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
     String tag = "Capacitor/Console";