github/cordova-plugin-camera
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2026-04-10 00:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fox(ios): Don't use weak in variable name

Browse Source 
- 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.
This commit is contained in:
Manuel Beck
2026-02-04 15:03:12 +01:00
parent 6f77735f79
commit 7954401d8d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ios/CDVCamera.m
View File

@@ -938,7 +938,7 @@ static NSString* MIME_JPEG = @"image/jpeg";
- (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 @@ static NSString* MIME_JPEG = @"image/jpeg";
// 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 @@ static NSString* MIME_JPEG = @"image/jpeg";
// 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 @@ static NSString* MIME_JPEG = @"image/jpeg";
- (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 @@ static NSString* MIME_JPEG = @"image/jpeg";
}
[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