diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java index 03210828b..59c352488 100644 --- a/src/android/CameraLauncher.java +++ b/src/android/CameraLauncher.java @@ -91,6 +91,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect private static final String PNG_EXTENSION = ".png"; private static final String PNG_MIME_TYPE = "image/png"; private static final String JPEG_MIME_TYPE = "image/jpeg"; + private static final String WILD_MIME_TYPE = "image/*"; private static final String GET_PICTURE = "Get Picture"; private static final String GET_VIDEO = "Get Video"; private static final String GET_All = "Get All"; @@ -710,7 +711,7 @@ private void processResultFromGallery(int destType, Intent intent) { this.callbackContext.success(uriString); } else { // If we don't have a valid image so quit. - if (!(JPEG_MIME_TYPE.equalsIgnoreCase(mimeType) || PNG_MIME_TYPE.equalsIgnoreCase(mimeType))) { + if (!(JPEG_MIME_TYPE.equalsIgnoreCase(mimeType) || PNG_MIME_TYPE.equalsIgnoreCase(mimeType) || WILD_MIME_TYPE.equalsIgnoreCase(mimeType))) { LOG.d(LOG_TAG, "I either have a null image path or bitmap"); this.failPicture("Unable to retrieve path to picture!"); return; diff --git a/src/android/FileHelper.java b/src/android/FileHelper.java index edf165787..5aa396c05 100644 --- a/src/android/FileHelper.java +++ b/src/android/FileHelper.java @@ -325,6 +325,6 @@ public static boolean isMediaDocument(Uri uri) { * @return Whether the Uri authority is Google Photos. */ public static boolean isGooglePhotosUri(Uri uri) { - return "com.google.android.apps.photos.content".equals(uri.getAuthority()); + return "com.google.android.apps.photos.content".equals(uri.getAuthority()) || "com.google.android.apps.photos.contentprovider".equals(uri.getAuthority()); } }