Merge pull request #21 from spoonconsulting/fix-image-picker-bug

Fix image picker bug

Author: parveshneedhoo

CHANGELOG.md

@@ -1,4 +1,8 @@
-## [2.1.1](https://github.com/spoonconsulting/cordova-plugin-telerik-imagepicker/compare/2.0.5...2.1.1) (2024-05-21)
+## [2.1.2](https://github.com/spoonconsulting/cordova-plugin-telerik-imagepicker/compare/2.1.1...2.1.2) (2024-05-27)
+
+* **ios:** Bug Fix.
+
+## [2.1.1](https://github.com/spoonconsulting/cordova-plugin-telerik-imagepicker/compare/2.1.0...2.1.1) (2024-05-21)
 
 * **ios:** Added a method `closeImagePicker` to close the image picker on ios devices.
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoonconsulting/cordova-plugin-telerik-imagepicker",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "cordova_name": "ImagePicker",
   "description": "This plugin allows selection of multiple images from the camera roll / gallery in a phonegap app",
   "license": "MIT",

package.json

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="@spoonconsulting/cordova-plugin-telerik-imagepicker"
-  version="2.1.1">
+  version="2.1.2">
 
     <name>ImagePicker</name>
 

plugin.xml

@@ -25,6 +25,5 @@
 @property (nonatomic, assign) NSInteger height;
 @property (nonatomic, assign) NSInteger quality;
 @property (nonatomic, assign) NSInteger outputType;
-@property (nonatomic, assign) GMImagePickerController* imagePicker;
 
 @end

src/ios/SOSPicker.h

@@ -83,7 +83,6 @@ - (void)launchGMImagePicker:(bool)allow_video title:(NSString *)title message:(N
     picker.colsInPortrait = 4;
     picker.colsInLandscape = 6;
     picker.minimumInteritemSpacing = 2.0;
-    self.imagePicker = picker;
 
     if(!disable_popover) {
         picker.modalPresentationStyle = UIModalPresentationPopover;
@@ -283,8 +282,8 @@ -(void)assetsPickerControllerDidCancel:(GMImagePickerController *)picker
 
 - (void) closeImagePicker:(CDVInvokedUrlCommand *)command {
     bool boolMessage = FALSE;
-    if (self.imagePicker && self.imagePicker.presentingViewController) {
-      [self.imagePicker.presentingViewController dismissViewControllerAnimated:YES completion:nil];
+    if (self.viewController != nil) {
+      [self.viewController dismissViewControllerAnimated:YES completion:nil];
       boolMessage = TRUE;
     }
     CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:boolMessage];