fix(android): avoid crash on input file capture (#3715)

ionic-team · Oct 22, 2020 · f502a99 · f502a99
1 parent 59c322b
commit f502a99
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java b/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java
@@ -5,6 +5,7 @@
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Environment;
@@ -331,9 +332,8 @@ public void onRequestPermissionResult(int requestCode, String[] permissions, int
     }
 
     private boolean isMediaCaptureSupported() {
-        Plugin camera = bridge.getPlugin("Camera").getInstance();
-        boolean isSupported = camera.hasPermission(Manifest.permission.CAMERA) || !camera.hasDefinedPermission(Manifest.permission.CAMERA);
-        return isSupported;
+        String[] permissions = { Manifest.permission.CAMERA };
+        return hasPermissions(permissions) || !hasDefinedPermission(Manifest.permission.CAMERA);
     }
 
     private void showMediaCaptureOrFilePicker(ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams, boolean isVideo) {
@@ -523,9 +523,29 @@ private boolean hasPermissions(String[] permissions) {
         return true;
     }
 
-    private void requestPermissions(String[] permissions, int requestCode) {
-        if (permissions != null) {
-            ActivityCompat.requestPermissions(this.bridge.getActivity(), permissions, requestCode);
+    private boolean hasDefinedPermission(String permission) {
+        boolean hasPermission = false;
+        String[] requestedPermissions = getManifestPermissions();
+        if (requestedPermissions != null && requestedPermissions.length > 0) {
+            List<String> requestedPermissionsList = Arrays.asList(requestedPermissions);
+            ArrayList<String> requestedPermissionsArrayList = new ArrayList<>(requestedPermissionsList);
+            if (requestedPermissionsArrayList.contains(permission)) {
+                hasPermission = true;
+            }
         }
+        return hasPermission;
+    }
+
+    private String[] getManifestPermissions() {
+        String[] requestedPermissions = null;
+        try {
+            PackageManager pm = bridge.getContext().getPackageManager();
+            PackageInfo packageInfo = pm.getPackageInfo(bridge.getContext().getPackageName(), PackageManager.GET_PERMISSIONS);
+
+            if (packageInfo != null) {
+                requestedPermissions = packageInfo.requestedPermissions;
+            }
+        } catch (Exception ex) {}
+        return requestedPermissions;
     }
 }