Code format

raju-muliyashiya · Raju · commit f6c1c9e97382 · 2025-11-26T11:06:49.000+05:30
diff --git a/packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -701,13 +701,11 @@ - (void)testPickMultiVideoWithoutLimit {
   XCTAssertEqual(plugin.callContext.maxItemCount, 0);
 }
 
-#pragma mark - Test immediate picker close detection
-
 - (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) {
@@ -719,46 +717,47 @@ - (void)testUIImagePickerImmediateCloseReturnsEmptyArray {
   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];
-      }
-    });
+    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];
+                     }
+                   });
   };
-  
+
   UIWindow *testWindow = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   testWindow.hidden = NO;
   [testWindow addSubview:controllerView];
-  
+
   [testWindow setNeedsLayout];
   [testWindow layoutIfNeeded];
-  
+
   [controllerView removeFromSuperview];
-  
+
   removeCallback();
-  
+
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }
 
 - (void)testPHPickerImmediateCloseReturnsEmptyArray API_AVAILABLE(ios(14)) {
   id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
   OCMStub(ClassMethod([photoLibrary authorizationStatus]))
       .andReturn(PHAuthorizationStatusAuthorized);
-  
+
   FLTImagePickerPlugin *plugin = [[FLTImagePickerPlugin alloc] init];
-  
+
   XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
-  
+
   [plugin pickMultiImageWithMaxSize:[[FLTMaxSize alloc] init]
                             quality:nil
                        fullMetadata:NO
@@ -770,23 +769,23 @@ - (void)testPHPickerImmediateCloseReturnsEmptyArray API_AVAILABLE(ios(14)) {
                            XCTAssertNil(error);
                            [resultExpectation fulfill];
                          }];
-  
+
   id mockPresentationController = OCMClassMock([UIPresentationController class]);
   [plugin presentationControllerDidDismiss:mockPresentationController];
-  
+
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }
 
 - (void)testObserverDoesNotInterfereWhenProcessingSelection API_AVAILABLE(ios(14)) {
   id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
   OCMStub(ClassMethod([photoLibrary authorizationStatus]))
       .andReturn(PHAuthorizationStatusAuthorized);
-  
+
   FLTImagePickerPlugin *plugin = [[FLTImagePickerPlugin alloc] init];
-  
+
   XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
   __block BOOL emptyResultReceived = NO;
-  
+
   [plugin pickMultiImageWithMaxSize:[[FLTMaxSize alloc] init]
                             quality:nil
                        fullMetadata:NO
@@ -800,38 +799,40 @@ - (void)testObserverDoesNotInterfereWhenProcessingSelection API_AVAILABLE(ios(14
                              emptyResultReceived = YES;
                            }
                          }];
-  
+
   NSURL *tiffURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"tiffImage"
                                                             withExtension:@"tiff"];
   NSItemProvider *tiffItemProvider = [[NSItemProvider alloc] initWithContentsOfURL:tiffURL];
   PHPickerResult *tiffResult = OCMClassMock([PHPickerResult class]);
   OCMStub([tiffResult itemProvider]).andReturn(tiffItemProvider);
-  
+
   id mockPickerViewController = OCMClassMock([PHPickerViewController class]);
-  
+
   [plugin picker:mockPickerViewController didFinishPicking:@[ tiffResult ]];
-  
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-    if (!resultExpectation.inverted) {
-      XCTAssertFalse(emptyResultReceived, @"Observer should not fire when processing selection");
-    }
-  });
-  
+
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   if (!resultExpectation.inverted) {
+                     XCTAssertFalse(emptyResultReceived,
+                                    @"Observer should not fire when processing selection");
+                   }
+                 });
+
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
 }
 
 - (void)testObserverRespectsContextClearing {
   id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
   OCMStub(ClassMethod([photoLibrary authorizationStatus]))
       .andReturn(PHAuthorizationStatusAuthorized);
-  
+
   FLTImagePickerPlugin *plugin = [[FLTImagePickerPlugin alloc] init];
   UIImagePickerController *controller = [[UIImagePickerController alloc] init];
   [plugin setImagePickerControllerOverrides:@[ controller ]];
-  
+
   XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
   __block NSInteger completionCallCount = 0;
-  
+
   [plugin pickImageWithSource:[FLTSourceSpecification makeWithType:FLTSourceTypeGallery
                                                             camera:FLTSourceCameraRear]
                       maxSize:[[FLTMaxSize alloc] init]
@@ -841,41 +842,42 @@ - (void)testObserverRespectsContextClearing {
                      completionCallCount++;
                      [resultExpectation fulfill];
                    }];
-  
+
   XCTAssertNotNil(plugin.callContext, @"Context should be set after pickImage call");
-  
+
   plugin.callContext = nil;
-  
+
   UIView *controllerView = controller.view;
   if (controllerView) {
     UIWindow *testWindow = [[UIWindow alloc] init];
     [testWindow addSubview:controllerView];
     [controllerView removeFromSuperview];
   }
-  
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-    XCTAssertLessThanOrEqual(completionCallCount, 1, 
-                             @"Observer should not fire after context is cleared");
-    if (completionCallCount == 0) {
-      [resultExpectation fulfill];
-    }
-  });
-  
+
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   XCTAssertLessThanOrEqual(completionCallCount, 1,
+                                            @"Observer should not fire after context is cleared");
+                   if (completionCallCount == 0) {
+                     [resultExpectation fulfill];
+                   }
+                 });
+
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }
 
 - (void)testObserverDelayAllowsDelegateMethodsToRunFirst {
   id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
   OCMStub(ClassMethod([photoLibrary authorizationStatus]))
       .andReturn(PHAuthorizationStatusAuthorized);
-  
+
   FLTImagePickerPlugin *plugin = [[FLTImagePickerPlugin alloc] init];
   UIImagePickerController *controller = [[UIImagePickerController alloc] init];
   [plugin setImagePickerControllerOverrides:@[ controller ]];
-  
+
   XCTestExpectation *resultExpectation = [self expectationWithDescription:@"result"];
   __block NSInteger callCount = 0;
-  
+
   [plugin pickImageWithSource:[FLTSourceSpecification makeWithType:FLTSourceTypeGallery
                                                             camera:FLTSourceCameraRear]
                       maxSize:[[FLTMaxSize alloc] init]
@@ -886,23 +888,27 @@ - (void)testObserverDelayAllowsDelegateMethodsToRunFirst {
                      if (callCount == 1) {
                        XCTAssertNil(result);
                        XCTAssertNil(error);
-                       
+
                        UIView *controllerView = controller.view;
                        if (controllerView) {
                          UIWindow *testWindow = [[UIWindow alloc] init];
                          [testWindow addSubview:controllerView];
                          [controllerView removeFromSuperview];
                        }
-                       
-                       dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                         XCTAssertEqual(callCount, 1, @"Observer should not fire after context cleared by cancel");
-                         [resultExpectation fulfill];
-                       });
+
+                       dispatch_after(
+                           dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)),
+                           dispatch_get_main_queue(), ^{
+                             XCTAssertEqual(
+                                 callCount, 1,
+                                 @"Observer should not fire after context cleared by cancel");
+                             [resultExpectation fulfill];
+                           });
                      }
                    }];
-  
+
   [plugin imagePickerControllerDidCancel:controller];
-  
+
   [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }
 
diff --git a/packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/FLTImagePickerPlugin.m b/packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/FLTImagePickerPlugin.m
@@ -33,21 +33,22 @@ - (instancetype)initWithResult:(nonnull FlutterResultAdapter)result {
 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.
+ * 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.
  */
 @interface FLTImagePickerRemoveObserverView : UIView
 
 @property(nonatomic, copy, nonnull) FLTImagePickerRemoveCallback removeCallback;
 
--(instancetype)initWithRemoveCallback:(FLTImagePickerRemoveCallback)callback;
+- (instancetype)initWithRemoveCallback:(FLTImagePickerRemoveCallback)callback;
 
 @end
 
 @implementation FLTImagePickerRemoveObserverView
 
-- (instancetype)initWithRemoveCallback:(FLTImagePickerRemoveCallback)callback{
+- (instancetype)initWithRemoveCallback:(FLTImagePickerRemoveCallback)callback {
   if (self = [super init]) {
     self.removeCallback = callback;
   }
@@ -56,7 +57,7 @@ - (instancetype)initWithRemoveCallback:(FLTImagePickerRemoveCallback)callback{
 - (void)didMoveToWindow {
   if (!self.window) {
     [self removeFromSuperview];
-    [[NSOperationQueue mainQueue]addOperationWithBlock:self.removeCallback];
+    [[NSOperationQueue mainQueue] addOperationWithBlock:self.removeCallback];
   }
 }
 @end
@@ -197,16 +198,17 @@ - (void)bindRemoveObserver:(nonnull UIViewController *)controller
                    context:(nonnull FLTImagePickerMethodCallContext *)context {
   __weak typeof(self) weakSelf = self;
   FLTImagePickerRemoveObserverView *removeObserverView =
-      [[FLTImagePickerRemoveObserverView alloc]initWithRemoveCallback:^{
+      [[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 && !strongSelf.isProcessingSelection) {
-            // Only send result if context is still active and we're not processing a selection
-            [strongSelf sendCallResultWithSavedPathList:nil];
-          }
-        });
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)),
+                       dispatch_get_main_queue(), ^{
+                         if (strongSelf && strongSelf.callContext == context &&
+                             !strongSelf.isProcessingSelection) {
+                           // Only send result if context is still active and we're not processing a
+                           // selection
+                           [strongSelf sendCallResultWithSavedPathList:nil];
+                         }
+                       });
       }];
   [controller.view addSubview:removeObserverView];
 }
