From 6f77735f799762b26b01aa771ad09378f8b039c1 Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Fri, 30 Jan 2026 19:28:33 +0100 Subject: [PATCH 1/2] ios: Rename variables `cameraPicker` to `cdvUIImagePickerController` - Make clear, that `CDVUIImagePickerController` is used for these variables - When it's used as weak variable, it's renamed to `weakCDVUIImagePickerController` --- src/ios/CDVCamera.m | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m index 0cdf30698..fb31de7f8 100644 --- a/src/ios/CDVCamera.m +++ b/src/ios/CDVCamera.m @@ -938,7 +938,7 @@ - (void)cleanup:(CDVInvokedUrlCommand*)command - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info { - __weak CDVUIImagePickerController* cameraPicker = (CDVUIImagePickerController*)picker; + __weak CDVUIImagePickerController* weakCDVUIImagePickerController = (CDVUIImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^(void) { @@ -948,9 +948,9 @@ - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingM // Image selected if ([mediaType isEqualToString:(NSString*)kUTTypeImage]) { - [weakSelf resultForImage:cameraPicker.pictureOptions info:info completion:^(CDVPluginResult* res) { + [weakSelf resultForImage:weakCDVUIImagePickerController.pictureOptions info:info completion:^(CDVPluginResult* res) { if (![self usesGeolocation] || picker.sourceType != UIImagePickerControllerSourceTypeCamera) { - [weakSelf.commandDelegate sendPluginResult:res callbackId:cameraPicker.callbackId]; + [weakSelf.commandDelegate sendPluginResult:res callbackId:weakCDVUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; } @@ -959,13 +959,13 @@ - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingM // Video selected } else { result = [weakSelf resultForVideo:info]; - [weakSelf.commandDelegate sendPluginResult:result callbackId:cameraPicker.callbackId]; + [weakSelf.commandDelegate sendPluginResult:result callbackId:weakCDVUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; } }; - [[cameraPicker presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; + [[weakCDVUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; } // older api calls newer didFinishPickingMediaWithInfo @@ -980,7 +980,7 @@ - (void)imagePickerController:(UIImagePickerController*)picker - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker { - __weak CDVUIImagePickerController* cameraPicker = (CDVUIImagePickerController*)picker; + __weak CDVUIImagePickerController* weakCDVUIImagePickerController = (CDVUIImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^ (void) { @@ -992,13 +992,13 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker } - [weakSelf.commandDelegate sendPluginResult:result callbackId:cameraPicker.callbackId]; + [weakSelf.commandDelegate sendPluginResult:result callbackId:weakCDVUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; }; - [[cameraPicker presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; + [[weakCDVUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; } #pragma mark CLLocationManager @@ -1203,24 +1203,24 @@ - (void)viewWillAppear:(BOOL)animated + (instancetype)createFromPictureOptions:(CDVPictureOptions*)pictureOptions { - CDVUIImagePickerController* cameraPicker = [[CDVUIImagePickerController alloc] init]; - cameraPicker.pictureOptions = pictureOptions; - cameraPicker.sourceType = pictureOptions.sourceType; - cameraPicker.allowsEditing = pictureOptions.allowsEditing; + CDVUIImagePickerController* cdvUIImagePickerController = [[CDVUIImagePickerController alloc] init]; + cdvUIImagePickerController.pictureOptions = pictureOptions; + cdvUIImagePickerController.sourceType = pictureOptions.sourceType; + cdvUIImagePickerController.allowsEditing = pictureOptions.allowsEditing; - if (cameraPicker.sourceType == UIImagePickerControllerSourceTypeCamera) { + if (cdvUIImagePickerController.sourceType == UIImagePickerControllerSourceTypeCamera) { // We only allow taking pictures (no video) in this API. - cameraPicker.mediaTypes = @[(NSString*)kUTTypeImage]; + cdvUIImagePickerController.mediaTypes = @[(NSString*)kUTTypeImage]; // We can only set the camera device if we're actually using the camera. - cameraPicker.cameraDevice = pictureOptions.cameraDirection; + cdvUIImagePickerController.cameraDevice = pictureOptions.cameraDirection; } else if (pictureOptions.mediaType == MediaTypeAll) { - cameraPicker.mediaTypes = [UIImagePickerController availableMediaTypesForSourceType:cameraPicker.sourceType]; + cdvUIImagePickerController.mediaTypes = [UIImagePickerController availableMediaTypesForSourceType:cdvUIImagePickerController.sourceType]; } else { NSArray* mediaArray = @[(NSString*)(pictureOptions.mediaType == MediaTypeVideo ? kUTTypeMovie : kUTTypeImage)]; - cameraPicker.mediaTypes = mediaArray; + cdvUIImagePickerController.mediaTypes = mediaArray; } - return cameraPicker; + return cdvUIImagePickerController; } @end From 7954401d8d5670b445f741fd69ed84682fe58c3b Mon Sep 17 00:00:00 2001 From: Manuel Beck Date: Wed, 4 Feb 2026 15:03:12 +0100 Subject: [PATCH 2/2] fox(ios): Don't use `weak` in variable name - Rename `weakCDVUIImagePickerController` to `cdvUIImagePickerController` - It doesn't matter if it's a weak reference or not, it works like any other variable. The only reason `weakSelf` is a convention is because you need to explicitly create a variable to hold the weak reference. --- src/ios/CDVCamera.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m index fb31de7f8..7cd28884e 100644 --- a/src/ios/CDVCamera.m +++ b/src/ios/CDVCamera.m @@ -938,7 +938,7 @@ - (void)cleanup:(CDVInvokedUrlCommand*)command - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info { - __weak CDVUIImagePickerController* weakCDVUIImagePickerController = (CDVUIImagePickerController*)picker; + __weak CDVUIImagePickerController* cdvUIImagePickerController = (CDVUIImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^(void) { @@ -948,9 +948,9 @@ - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingM // Image selected if ([mediaType isEqualToString:(NSString*)kUTTypeImage]) { - [weakSelf resultForImage:weakCDVUIImagePickerController.pictureOptions info:info completion:^(CDVPluginResult* res) { + [weakSelf resultForImage:cdvUIImagePickerController.pictureOptions info:info completion:^(CDVPluginResult* res) { if (![self usesGeolocation] || picker.sourceType != UIImagePickerControllerSourceTypeCamera) { - [weakSelf.commandDelegate sendPluginResult:res callbackId:weakCDVUIImagePickerController.callbackId]; + [weakSelf.commandDelegate sendPluginResult:res callbackId:cdvUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; } @@ -959,13 +959,13 @@ - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingM // Video selected } else { result = [weakSelf resultForVideo:info]; - [weakSelf.commandDelegate sendPluginResult:result callbackId:weakCDVUIImagePickerController.callbackId]; + [weakSelf.commandDelegate sendPluginResult:result callbackId:cdvUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; } }; - [[weakCDVUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; + [[cdvUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; } // older api calls newer didFinishPickingMediaWithInfo @@ -980,7 +980,7 @@ - (void)imagePickerController:(UIImagePickerController*)picker - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker { - __weak CDVUIImagePickerController* weakCDVUIImagePickerController = (CDVUIImagePickerController*)picker; + __weak CDVUIImagePickerController* cdvUIImagePickerController = (CDVUIImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^ (void) { @@ -992,13 +992,13 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker } - [weakSelf.commandDelegate sendPluginResult:result callbackId:weakCDVUIImagePickerController.callbackId]; + [weakSelf.commandDelegate sendPluginResult:result callbackId:cdvUIImagePickerController.callbackId]; weakSelf.hasPendingOperation = NO; weakSelf.cdvUIImagePickerController = nil; }; - [[weakCDVUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; + [[cdvUIImagePickerController presentingViewController] dismissViewControllerAnimated:YES completion:invoke]; } #pragma mark CLLocationManager