@connectedbits/react-native-image-picker 2.4.15-android-legacy → 2.4.16-rc0

package/android/build.gradle

@@ -52,9 +52,6 @@ repositories {
 
 dependencies {
     api "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:support-compat:28.0.0'
 
     testImplementation('org.robolectric:robolectric:4.3.1') {
         // https://github.com/robolectric/robolectric/issues/5245

package/android/gradle.properties

@@ -5,5 +5,5 @@ ReactNativeImagePicker_buildToolsVersion=28.0.3
 ReactNativeImagePicker_targetSdkVersion=27
 ReactNativeImagePicker_minSdkVersion=24
 
-android.useAndroidX=false
-android.enableJetifier=false
+android.useAndroidX=true
+android.enableJetifier=true

package/android/src/main/java/com/imagepicker/FileProvider.java

@@ -1,4 +1,4 @@
 package com.imagepicker;
 
-public class FileProvider extends android.support.v4.content.FileProvider {
+public class FileProvider extends androidx.core.content.FileProvider {
 }

package/android/src/main/java/com/imagepicker/ImagePickerModule.java

@@ -13,10 +13,10 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.ActivityCompat;
-import android.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AlertDialog;
 
 import android.util.Base64;
 import android.content.pm.PackageManager;
@@ -559,8 +559,16 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
                                    @NonNull final Callback callback,
                                    @NonNull final int requestCode)
   {
-    final int writePermission = ActivityCompat
-            .checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+    int writePermission = 0;
+    int libraryPermission = 0;
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+      writePermission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+      libraryPermission = writePermission;
+    } else {
+      writePermission = PackageManager.PERMISSION_GRANTED;
+      libraryPermission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_MEDIA_IMAGES);
+    }
+
     final int cameraPermission = ActivityCompat
             .checkSelfPermission(activity, Manifest.permission.CAMERA);
 
@@ -568,7 +576,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
     switch (requestCode) {
       case REQUEST_PERMISSIONS_FOR_LIBRARY:
-        permissionsGranted = writePermission == PackageManager.PERMISSION_GRANTED;
+        permissionsGranted = libraryPermission == PackageManager.PERMISSION_GRANTED;
         break;
       case REQUEST_PERMISSIONS_FOR_CAMERA:
         permissionsGranted = cameraPermission == PackageManager.PERMISSION_GRANTED && writePermission == PackageManager.PERMISSION_GRANTED;
@@ -577,7 +585,12 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
     if (!permissionsGranted)
     {
-      final Boolean dontAskAgain = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA);
+      Boolean dontAskAgain = false;
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        dontAskAgain = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA);
+      } else {
+        dontAskAgain = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_MEDIA_IMAGES) && ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.CAMERA);
+      }
 
       if (dontAskAgain)
       {
@@ -626,10 +639,18 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
         String[] PERMISSIONS;
         switch (requestCode) {
           case REQUEST_PERMISSIONS_FOR_LIBRARY:
-            PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+              PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            } else {
+              PERMISSIONS = new String[]{Manifest.permission.READ_MEDIA_IMAGES};
+            }
             break;
           case REQUEST_PERMISSIONS_FOR_CAMERA:
-            PERMISSIONS = new String[]{Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+              PERMISSIONS = new String[]{Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE};
+            } else {
+              PERMISSIONS = new String[]{Manifest.permission.CAMERA};
+            }
             break;
           default:
             PERMISSIONS = new String[]{};

package/android/src/main/java/com/imagepicker/ImagePickerPackage.java

@@ -1,6 +1,6 @@
 package com.imagepicker;
 
-import android.support.annotation.StyleRes;
+import androidx.annotation.StyleRes;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;

package/android/src/main/java/com/imagepicker/ResponseHelper.java

@@ -1,6 +1,6 @@
 package com.imagepicker;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;

package/android/src/main/java/com/imagepicker/media/ImageConfig.java

@@ -1,7 +1,7 @@
 package com.imagepicker.media;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import android.net.Uri;
 import android.webkit.MimeTypeMap;

package/android/src/main/java/com/imagepicker/permissions/OnImagePickerPermissionsCallback.java

@@ -1,6 +1,6 @@
 package com.imagepicker.permissions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.facebook.react.modules.core.PermissionListener;
 
 /**

package/android/src/main/java/com/imagepicker/permissions/PermissionUtils.java

@@ -2,9 +2,9 @@ package com.imagepicker.permissions;
 
 import android.app.Activity;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;

package/android/src/main/java/com/imagepicker/utils/ButtonsHelper.java

@@ -1,7 +1,7 @@
 package com.imagepicker.utils;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;

package/android/src/main/java/com/imagepicker/utils/MediaUtils.java

@@ -6,8 +6,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.imagepicker.ResponseHelper;

package/android/src/main/java/com/imagepicker/utils/ReadableMapUtils.java

@@ -1,6 +1,6 @@
 package com.imagepicker.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.facebook.react.bridge.ReadableMap;

package/android/src/main/java/com/imagepicker/utils/RealPathUtil.java

@@ -9,9 +9,9 @@ import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.content.ContentUris;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 

package/android/src/main/java/com/imagepicker/utils/UI.java

@@ -3,9 +3,9 @@ package com.imagepicker.utils;
 import android.content.Context;
 import android.content.DialogInterface;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.widget.ArrayAdapter;
 
 import com.facebook.react.bridge.ReadableMap;

package/android/src/test/java/com/imagepicker/testing/TestableImagePickerModule.java

@@ -1,9 +1,9 @@
 package com.imagepicker.testing;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedbits/react-native-image-picker",
-  "version": "2.4.15-android-legacy",
+  "version": "2.4.16-rc0",
   "description": "A React Native module that allows you to use native UI to select media from the device library or directly from the camera",
   "react-native": "src/index.ts",
   "types": "lib/typescript/index.d.ts",