@connectedbits/react-native-image-picker 2.4.12 → 2.4.14-android-legacy

package/android/build.gradle

@@ -52,6 +52,9 @@ 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=true
-android.enableJetifier=true
+android.useAndroidX=false
+android.enableJetifier=false

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

@@ -1,4 +1,4 @@
 package com.imagepicker;
 
-public class FileProvider extends androidx.core.content.FileProvider {
+public class FileProvider extends android.support.v4.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 androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-import androidx.core.app.ActivityCompat;
-import androidx.appcompat.app.AlertDialog;
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
+import android.support.v4.app.ActivityCompat;
+import android.app.AlertDialog;
 
 import android.util.Base64;
 import android.content.pm.PackageManager;
@@ -285,12 +285,6 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
       cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, cameraCaptureURI);
     }
 
-    if (cameraIntent.resolveActivity(reactContext.getPackageManager()) == null)
-    {
-      responseHelper.invokeError(callback, "Cannot launch camera");
-      return;
-    }
-
     // Workaround for Android bug.
     // grantUriPermission also needed for KITKAT,
     // see https://code.google.com/p/android/issues/detail?id=76683
@@ -309,7 +303,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
     catch (ActivityNotFoundException e)
     {
       e.printStackTrace();
-      responseHelper.invokeError(callback, "Cannot launch camera");
+      responseHelper.invokeError(callback, "Cannot launch camera, unable to start");
     }
   }
 
@@ -364,12 +358,6 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
       }
     }
 
-    if (libraryIntent.resolveActivity(reactContext.getPackageManager()) == null)
-    {
-      responseHelper.invokeError(callback, "Cannot launch photo library");
-      return;
-    }
-
     try
     {
       String chooseWhichLibraryTitle = null;

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

@@ -1,6 +1,6 @@
 package com.imagepicker;
 
-import androidx.annotation.StyleRes;
+import android.support.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 androidx.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
+import android.support.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.FileProvider;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.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 androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;

package/ios/ImagePickerManager.m

@@ -381,11 +381,11 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
             NSString *mimeType;
             if ([[self.options objectForKey:@"imageFileType"] isEqualToString:@"png"]) {
                 data = UIImagePNGRepresentation(editedImage);
-                mimeType = (__bridge_transfer NSString *)@"image/png";
+                mimeType = @"image/png";
             }
             else {
                 data = UIImageJPEGRepresentation(editedImage, [[self.options valueForKey:@"quality"] floatValue]);
-                mimeType = (__bridge_transfer NSString *)@"image/jpeg";
+                mimeType = @"image/jpeg";
             }
             [self.response setObject:mimeType forKey:@"type"];
             [data writeToFile:path atomically:YES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedbits/react-native-image-picker",
-  "version": "2.4.12",
+  "version": "2.4.14-android-legacy",
   "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",

package/android/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android_</name>
-	<comment>Project android_ created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true