Address gemini comments

Author: raju-muliyashiya

packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImagePickerPluginTests.m

@@ -704,47 +704,40 @@ - (void)testPickMultiVideoWithoutLimit {
 - (void)testUIImagePickerImmediateCloseReturnsEmptyArray {
   FLTImagePickerPlugin *plugin = [[FLTImagePickerPlugin alloc] init];
 
-  XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
-
-  FLTImagePickerMethodCallContext *context = [[FLTImagePickerMethodCallContext alloc]
-      initWithResult:^void(NSArray<NSString *> *paths, FlutterError *error) {
-        if (paths == nil || paths.count == 0) {
-          XCTAssertNil(error);
-          [resultExpectation fulfill];
-        }
-      }];
-  context.includeImages = YES;
-  context.maxSize = [[FLTMaxSize alloc] init];
-  context.maxItemCount = 1;
-  context.requestFullMetadata = NO;
-
-  plugin.callContext = context;
-
   UIImagePickerController *controller = [[UIImagePickerController alloc] init];
-  UIView *controllerView = controller.view;
-
-  UIView *observerView = [[UIView alloc] init];
-  [controllerView addSubview:observerView];
-
-  void (^removeCallback)(void) = ^{
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)),
-                   dispatch_get_main_queue(), ^{
-                     if (plugin && plugin.callContext == context && !plugin.isProcessingSelection) {
-                       [plugin sendCallResultWithSavedPathList:nil];
-                     }
-                   });
-  };
+  [plugin setImagePickerControllerOverrides:@[ controller ]];
 
-  UIWindow *testWindow = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
-  testWindow.hidden = NO;
-  [testWindow addSubview:controllerView];
+  // Mock camera access to avoid permission dialogs and device-specific logic.
+  id mockUIImagePicker = OCMClassMock([UIImagePickerController class]);
+  OCMStub(ClassMethod([mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+      .andReturn(YES);
+  OCMStub(ClassMethod([mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
+      .andReturn(YES);
+  id mockAVCaptureDevice = OCMClassMock([AVCaptureDevice class]);
+  OCMStub([mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
+      .andReturn(AVAuthorizationStatusAuthorized);
 
-  [testWindow setNeedsLayout];
-  [testWindow layoutIfNeeded];
+  XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
 
-  [controllerView removeFromSuperview];
+  FLTSourceSpecification *source = [FLTSourceSpecification makeWithType:FLTSourceTypeCamera
+                                                                 camera:FLTSourceCameraRear];
+  [plugin pickImageWithSource:source
+                      maxSize:[[FLTMaxSize alloc] init]
+                      quality:nil
+                 fullMetadata:NO
+                   completion:^(NSString *_Nullable result, FlutterError *_Nullable error) {
+                     XCTAssertNil(result);
+                     XCTAssertNil(error);
+                     [resultExpectation fulfill];
+                   }];
 
-  removeCallback();
+  // The `pickImage` call will attach the observer. Now, simulate dismissal.
+  // This needs to happen on the next run loop to ensure the observer is attached.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    UIWindow *testWindow = [[UIWindow alloc] init];
+    [testWindow addSubview:controller.view];
+    [controller.view removeFromSuperview];
+  });
 
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }

packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/FLTImagePickerPlugin.m

@@ -28,15 +28,22 @@ - (instancetype)initWithResult:(nonnull FlutterResultAdapter)result {
 @end
 
 /**
- * a callback function what the PickerViewController remove from window.
+ * A callback function that is invoked when the PickerViewController is removed from the window.
+ * This callback is used to handle cleanup operations and notify the plugin when the picker
+ * interface has been dismissed, either through user interaction or programmatically.
  */
 typedef void (^FLTImagePickerRemoveCallback)(void);
 
 /**
- * Add the view to the PickerViewController's view, observing its window to observe the window of
- * PickerViewController. This is to prevent PickerViewController from being removed from the screen
- * without receiving callback information under other circumstances, such as being interactively
- * dismissed before PickerViewController has fully popped up.
+ * A UIView subclass that monitors the removal of a PickerViewController from the window hierarchy.
+ * 
+ * This observer view is added to the PickerViewController's view and monitors changes to its window
+ * property. When the PickerViewController is removed from the screen (either through user dismissal
+ * or programmatic dismissal), this view detects the change and triggers the associated callback.
+ * 
+ * This mechanism ensures that the plugin receives notification when the picker is dismissed under
+ * various circumstances, including interactive dismissal gestures that occur before the
+ * PickerViewController has fully appeared on screen.
  */
 @interface FLTImagePickerRemoveObserverView : UIView
 
@@ -200,6 +207,8 @@ - (void)bindRemoveObserver:(nonnull UIViewController *)controller
   FLTImagePickerRemoveObserverView *removeObserverView =
       [[FLTImagePickerRemoveObserverView alloc] initWithRemoveCallback:^{
         __strong typeof(weakSelf) strongSelf = weakSelf;
+        // Add a small delay to ensure delegate methods have a chance to run first
+        // This prevents the observer from firing during normal selection flow
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)),
                        dispatch_get_main_queue(), ^{
                          if (strongSelf && strongSelf.callContext == context &&