Merge pull request #256 from NativeScript/tbozhikov/fix-early-delegate-collection

fix: register delegate in global scope on creation, clear it when dismissed

Author: tbozhikov

src/imagepicker.ios.ts

@@ -19,15 +19,14 @@ const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any
 
 export class ImagePicker extends data_observable.Observable {
     _imagePickerController: QBImagePickerController;
-    _imagePickerControllerDelegate: ImagePickerControllerDelegate;
     _hostView: View;
 
     // lazy-load latest frame.topmost() if _hostName is not used
     get hostView() {
         return this._hostView;
     }
 
-    get hostController() {
+    get hostController(): UIViewController {
         let vc = this.hostView ? this.hostView.viewController : UIApplication.sharedApplication.keyWindow.rootViewController;
         while (
             vc.presentedViewController
@@ -43,9 +42,9 @@ export class ImagePicker extends data_observable.Observable {
         super();
 
         this._hostView = hostView;
-        this._imagePickerControllerDelegate = ImagePickerControllerDelegate.new();
 
         let imagePickerController = QBImagePickerController.alloc().init();
+
         imagePickerController.assetCollectionSubtypes = defaultAssetCollectionSubtypes;
         imagePickerController.mediaType = options.mediaType ? <QBImagePickerMediaType>options.mediaType.valueOf() : QBImagePickerMediaType.Any;
         imagePickerController.allowsMultipleSelection = options.mode !== 'single';
@@ -76,12 +75,13 @@ export class ImagePicker extends data_observable.Observable {
 
     present() {
         return new Promise<void>((resolve, reject) => {
-            this._imagePickerControllerDelegate._resolve = resolve;
-            this._imagePickerControllerDelegate._reject = reject;
+            const imagePickerControllerDelegate = ImagePickerControllerDelegate.new();
+            imagePickerControllerDelegate._resolve = resolve;
+            imagePickerControllerDelegate._reject = reject;
 
-            this.hostController.presentViewControllerAnimatedCompletion(this._imagePickerController, true, () => {
-                this._imagePickerController.delegate = this._imagePickerControllerDelegate;
-            });
+            this._imagePickerController.delegate = imagePickerControllerDelegate;
+
+            this.hostController.presentViewControllerAnimatedCompletion(this._imagePickerController, true, null);
         });
     }
 }
@@ -93,6 +93,8 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
     qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void {
         imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
         this._reject(new Error("Selection canceled."));
+
+        this.deRegisterFromGlobal();
     }
 
     qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, iosAssets: NSArray<any>): void {
@@ -112,6 +114,7 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
         this._resolve(assets);
 
         imagePickerController.dismissViewControllerAnimatedCompletion(true, () => {
+            this.deRegisterFromGlobal();
             // FIX: possible memory issue when picking images many times.
             // Not the best solution, but the only one working for now
             // https://github.com/NativeScript/nativescript-imagepicker/issues/222
@@ -120,10 +123,24 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
 
     }
 
+    // FIX: stores a reference to global scope, so that the delegate is not collected in native
+    // https://github.com/NativeScript/nativescript-imagepicker/issues/251
+    private registerToGlobal(): any {
+        (<any>global).imagePickerControllerDelegate = this;
+    }
+
+    private deRegisterFromGlobal(): any {
+        (<any>global).imagePickerControllerDelegate = null;
+    }
+
     public static ObjCProtocols = [QBImagePickerControllerDelegate];
 
     static new(): ImagePickerControllerDelegate {
-        return <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
+        const instance = <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
+
+        instance.registerToGlobal();
+
+        return instance;
     }
 }