expo-image-picker 14.3.0 → 14.3.1

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 14.3.1 — 2023-07-04
+
+### 🐛 Bug fixes
+
+- Fix manifest merger build fail on Android. ([#23191](https://github.com/expo/expo/pull/23191) by [@alexandrius](https://github.com/alexandrius))
+- [Android] Fix backported photo picker crashing with null intent. ([#23224](https://github.com/expo/expo/pull/23224) by [@thespacemanatee](https://github.com/thespacemanatee))
+
 ## 14.3.0 — 2023-06-13
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '14.3.0'
+version = '14.3.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -67,7 +67,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 22
-    versionName "14.3.0"
+    versionName "14.3.1"
   }
   lintOptions {
     abortOnError false
@@ -85,7 +85,7 @@ dependencies {
   implementation "androidx.activity:activity-ktx:1.7.1"
   implementation "androidx.appcompat:appcompat:1.4.2"
   implementation "androidx.exifinterface:exifinterface:1.3.3"
-  implementation "com.github.CanHub:Android-Image-Cropper:4.3.0"
+  implementation "com.github.CanHub:Android-Image-Cropper:4.3.1"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:tools="http://schemas.android.com/tools"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Required for picking images from camera directly -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -10,22 +9,10 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
 
     <application>
-      <!-- Trigger Google Play services to install the backported photo picker module. -->
-      <service android:name="com.google.android.gms.metadata.ModuleDependencies"
-        android:enabled="false"
-        android:exported="false"
-        tools:ignore="MissingClass">
-        <intent-filter>
-            <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
-        </intent-filter>
-        <meta-data android:name="photopicker_activity:0:required" android:value="" />
-      </service>
-
-
       <activity
         android:name="com.canhub.cropper.CropImageActivity"
         android:theme="@style/Base.Theme.AppCompat"/>
-      <!-- https://developer.android.com/guide/topics/manifest/provider-element.html -->
+        <!-- https://developer.android.com/guide/topics/manifest/provider-element.html -->
         <provider
             android:name=".fileprovider.ImagePickerFileProvider"
             android:authorities="${applicationId}.ImagePickerFileProvider"

package/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt

@@ -33,41 +33,57 @@ internal class ImageLibraryContract(
     }.contentResolver
 
   override fun createIntent(context: Context, input: ImageLibraryContractOptions): Intent {
-    val request = PickVisualMediaRequest.Builder()
-      .setMediaType(
-        when (input.options.mediaTypes) {
-          MediaTypes.VIDEOS -> {
-            PickVisualMedia.VideoOnly
-          }
-          MediaTypes.IMAGES -> {
-            PickVisualMedia.ImageOnly
-          }
-          else -> {
-            PickVisualMedia.ImageAndVideo
+    if (PickVisualMedia.isPhotoPickerAvailable(context)) {
+      val request = PickVisualMediaRequest.Builder()
+        .setMediaType(
+          when (input.options.mediaTypes) {
+            MediaTypes.VIDEOS -> {
+              PickVisualMedia.VideoOnly
+            }
+
+            MediaTypes.IMAGES -> {
+              PickVisualMedia.ImageOnly
+            }
+
+            else -> {
+              PickVisualMedia.ImageAndVideo
+            }
           }
-        }
-      ).build()
+        ).build()
 
-    if (input.options.allowsMultipleSelection) {
-      val selectionLimit = input.options.selectionLimit
+      if (input.options.allowsMultipleSelection) {
+        val selectionLimit = input.options.selectionLimit
 
-      if (selectionLimit == 1) {
-        // If multiple selection is allowed but the limit is 1, we should ignore
-        // the multiple selection flag and just treat it as a single selection.
-        return PickVisualMedia().createIntent(context, request)
-      }
+        if (selectionLimit == 1) {
+          // If multiple selection is allowed but the limit is 1, we should ignore
+          // the multiple selection flag and just treat it as a single selection.
+          return PickVisualMedia().createIntent(context, request)
+        }
 
-      if (selectionLimit > 1) {
-        return PickMultipleVisualMedia(selectionLimit).createIntent(context, request)
-      }
+        if (selectionLimit > 1) {
+          return PickMultipleVisualMedia(selectionLimit).createIntent(context, request)
+        }
 
-      // If the selection limit is 0, it is the same as unlimited selection.
-      if (selectionLimit == UNLIMITED_SELECTION) {
-        return PickMultipleVisualMedia().createIntent(context, request)
+        // If the selection limit is 0, it is the same as unlimited selection.
+        if (selectionLimit == UNLIMITED_SELECTION) {
+          return PickMultipleVisualMedia().createIntent(context, request)
+        }
       }
+
+      return PickVisualMedia().createIntent(context, request)
     }
 
-    return PickVisualMedia().createIntent(context, request)
+    return Intent(Intent.ACTION_GET_CONTENT)
+      .addCategory(Intent.CATEGORY_OPENABLE)
+      .setType(input.options.mediaTypes.toMimeType())
+      .apply {
+        if (input.options.allowsMultipleSelection) {
+          putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+        }
+        if (input.options.mediaTypes == MediaTypes.ALL) {
+          putExtra(Intent.EXTRA_MIME_TYPES, arrayOf(MediaTypes.IMAGES.toMimeType(), MediaTypes.VIDEOS.toMimeType()))
+        }
+      }
   }
 
   override fun parseResult(input: ImageLibraryContractOptions, resultCode: Int, intent: Intent?) =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-picker",
-  "version": "14.3.0",
+  "version": "14.3.1",
   "description": "Provides access to the system's UI for selecting images and videos from the phone's library or taking a photo with the camera.",
   "main": "build/ImagePicker.js",
   "types": "build/ImagePicker.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "3ccd2edee9cbfed217557675cb50f0ba5e55a9e4"
+  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
 }