Merge remote-tracking branch 'ivpusic/master'

This commit is contained in:
Andrew Shini 2017-02-25 14:11:21 +10:00
commit a766f0ac0a

View File

@ -302,7 +302,9 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi
if (cropping) {
galleryIntent.setType("image/*");
} else {
galleryIntent.setType("image/*,video/*");
String[] mimetypes = {"image/*", "video/*"};
galleryIntent.setType("*/*");
galleryIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
}
galleryIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multiple);