@connectedbits/react-native-image-picker 2.4.16-rc2 → 2.4.16-rc3

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

@@ -152,23 +152,22 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
   @ReactMethod
   public void showImagePicker(final ReadableMap options, final Callback callback) {
+    final ImagePickerModule self = this;
+    final Activity currentActivity = getCurrentActivity();
     Handler handler = new Handler(this.reactContext.getMainLooper());
+    this.callback = callback;
+    this.options = options;
+    if (currentActivity == null)
+    {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
+    imageConfig = new ImageConfig(0, 0, 100, 0, false);
     handler.post(new Runnable() {
       @Override
       public void run() {
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity == null)
-        {
-          responseHelper.invokeError(callback, "can't find current Activity");
-          return;
-        }
-
-        this.callback = callback;
-        this.options = options;
-        imageConfig = new ImageConfig(0, 0, 100, 0, false);
 
-        final AlertDialog dialog = UI.chooseDialog(this, options, new UI.OnAction()
+        final AlertDialog dialog = UI.chooseDialog(self, options, new UI.OnAction()
         {
           @Override
           public void onTakePhoto(@NonNull final ImagePickerModule module)
@@ -233,34 +232,35 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
   @ReactMethod
   public void launchCamera(final ReadableMap options, final Callback callback)
   {
-    Handler handler = new Handler(this.reactContext.getMainLooper());
-    handler.post(new Runnable() {
-                   @Override
-                   public void run() {
-                     permissionRequestCallback = callback;
+    final ImagePickerModule self = this;
+    Handler handler = new Handler(this.getContext().getMainLooper());
+    permissionRequestCallback = callback;
 
-                     if (!isCameraAvailable())
-                     {
-                       responseHelper.invokeError(callback, "Camera not available");
-                       return;
-                     }
+    if (!isCameraAvailable())
+    {
+      responseHelper.invokeError(callback, "Camera not available");
+      return;
+    }
 
-                     final Activity currentActivity = getCurrentActivity();
-                     if (currentActivity == null)
-                     {
-                       responseHelper.invokeError(callback, "can't find current Activity");
-                       return;
-                     }
+    final Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null)
+    {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
 
-                     this.callback = callback;
-                     this.options = options;
+    this.callback = callback;
+    this.options = options;
 
+    handler.post(new Runnable() {
+                   @Override
+                   public void run() {
                      if (!permissionsCheck(currentActivity, callback, REQUEST_PERMISSIONS_FOR_CAMERA))
                      {
                        return;
                      }
 
-                     parseOptions(this.options);
+                     parseOptions(options);
 
                      int requestCode;
                      Intent cameraIntent;
@@ -280,10 +280,10 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
                        requestCode = REQUEST_LAUNCH_IMAGE_CAPTURE;
                        cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
 
-                       final File original = createNewFile(reactContext, this.options, false);
+                       final File original = createNewFile(self.getContext(), options, false);
 
                        if (original != null) {
-                         cameraCaptureURI = RealPathUtil.compatUriFromFile(reactContext, original);
+                         cameraCaptureURI = RealPathUtil.compatUriFromFile(self.getContext(), original);
                        }else {
                          responseHelper.invokeError(callback, "Couldn't get file path for photo");
                          return;
@@ -300,10 +300,10 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
                      // grantUriPermission also needed for KITKAT,
                      // see https://code.google.com/p/android/issues/detail?id=76683
                      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
-                       List<ResolveInfo> resInfoList = reactContext.getPackageManager().queryIntentActivities(cameraIntent, PackageManager.MATCH_DEFAULT_ONLY);
+                       List<ResolveInfo> resInfoList = self.getContext().getPackageManager().queryIntentActivities(cameraIntent, PackageManager.MATCH_DEFAULT_ONLY);
                        for (ResolveInfo resolveInfo : resInfoList) {
                          String packageName = resolveInfo.activityInfo.packageName;
-                         reactContext.grantUriPermission(packageName, cameraCaptureURI, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                         self.getContext().grantUriPermission(packageName, cameraCaptureURI, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
                        }
                      }
 
@@ -328,27 +328,27 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
   @ReactMethod
   public void launchImageLibrary(final ReadableMap options, final Callback callback)
   {
-    Handler handler = new Handler(this.reactContext.getMainLooper());
-    handler.post(new Runnable() {
-      @Override
-      public void run(){
-        permissionRequestCallback = callback;
+    permissionRequestCallback = callback;
 
-        final Activity currentActivity = getCurrentActivity();
-        if (currentActivity == null) {
-          responseHelper.invokeError(callback, "can't find current Activity");
-          return;
-        }
+    final Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null) {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
 
-        this.callback = callback;
-        this.options = options;
+    this.callback = callback;
+    this.options = options;
 
+    Handler handler = new Handler(this.getContext().getMainLooper());
+    handler.post(new Runnable() {
+      @Override
+      public void run(){
         if (!permissionsCheck(currentActivity, callback, REQUEST_PERMISSIONS_FOR_LIBRARY))
         {
           return;
         }
 
-        parseOptions(this.options);
+        parseOptions(options);
 
         int requestCode;
         Intent libraryIntent;
@@ -395,12 +395,13 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
   }
 
   @Override
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-    Handler handler = new Handler(this.reactContext.getMainLooper());
+  public void onActivityResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
+    final ImagePickerModule self = this;
+    Handler handler = new Handler(this.getContext().getMainLooper());
     handler.post(new Runnable() {
       @Override
       public void run() {
-        if (passResult(requestCode))
+        if (self.passResult(requestCode))
         {
           return;
         }
@@ -447,7 +448,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
         ReadExifResult result = null;
         try {
-          InputStream imageInputStream = reactContext.getContentResolver().openInputStream(uri);
+          InputStream imageInputStream = self.getContext().getContentResolver().openInputStream(uri);
           if(imageInputStream != null){
             result = readExifInterface(imageInputStream, responseHelper);
           }
@@ -472,7 +473,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
         options.inJustDecodeBounds = true;
         Bitmap imageBitmap = null;
         try {
-          InputStream imageInputStream = reactContext.getContentResolver().openInputStream(uri);
+          InputStream imageInputStream = self.getContext().getContentResolver().openInputStream(uri);
           imageBitmap = BitmapFactory.decodeStream(imageInputStream, null, options);
         } catch(FileNotFoundException ex){
           responseHelper.invokeError(callback, "Could not find file");
@@ -492,7 +493,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
           responseHelper.putInt("height", initialHeight);
 
           try {
-            InputStream imageInputStream = reactContext.getContentResolver().openInputStream(uri);
+            InputStream imageInputStream = self.getContext().getContentResolver().openInputStream(uri);
             updatedResultResponse(imageInputStream);
           } catch(FileNotFoundException ex){
             responseHelper.invokeError(callback, "Could not find file");
@@ -505,7 +506,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
           Bitmap resizedImage = null;
           ImageConfig rotatedImageConfig = imageConfig.withRotation(result.currentRotation);
           try {
-            InputStream imageInputStream = reactContext.getContentResolver().openInputStream(uri);
+            InputStream imageInputStream = self.getContext().getContentResolver().openInputStream(uri);
             resizedImage = getResizedImage(imageInputStream, rotatedImageConfig, initialWidth, initialHeight);
           } catch(FileNotFoundException ex){
             responseHelper.invokeError(callback, "Could not find file");
@@ -537,8 +538,8 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
 
         responseHelper.invokeResponse(callback);
-        callback = null;
-        this.options = null;
+        self.callback = null;
+        self.options = null;
       }
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedbits/react-native-image-picker",
-  "version": "2.4.16-rc2",
+  "version": "2.4.16-rc3",
   "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",