This is an automated email from the ASF dual-hosted git repository. manuelbeck pushed a commit to branch pr-ios-rename-CDVCameraPicker in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git
commit 635e804535b9c93fbec9e6feb01687357ce5d977 Author: Manuel Beck <[email protected]> AuthorDate: Fri Jan 30 12:18:10 2026 +0100 ios: rename `CDVCameraPicker` to `CDVImagePickerController` - Rename to `CDVImagePickerController` since it inherits from `UIImagePickerController` and is not only for taking pictures --- src/ios/CDVCamera.h | 4 ++-- src/ios/CDVCamera.m | 10 +++++----- tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ios/CDVCamera.h b/src/ios/CDVCamera.h index 8f57060..ff0f465 100644 --- a/src/ios/CDVCamera.h +++ b/src/ios/CDVCamera.h @@ -85,7 +85,7 @@ typedef NSUInteger CDVMediaType; @end -@interface CDVCameraPicker : UIImagePickerController +@interface CDVImagePickerController : UIImagePickerController @property (strong) CDVPictureOptions* pictureOptions; @@ -114,7 +114,7 @@ typedef NSUInteger CDVMediaType; {} #endif -@property (strong) CDVCameraPicker* pickerController; +@property (strong) CDVImagePickerController* pickerController; @property (strong) NSMutableDictionary *metadata; @property (strong, nonatomic) CLLocationManager *locationManager; @property (strong) NSData* data; diff --git a/src/ios/CDVCamera.m b/src/ios/CDVCamera.m index 79a78b1..a47ecd6 100644 --- a/src/ios/CDVCamera.m +++ b/src/ios/CDVCamera.m @@ -275,7 +275,7 @@ static NSString* MIME_JPEG = @"image/jpeg"; // Use UIImagePickerController for camera or as image picker for iOS older than 14 // UIImagePickerController must be created and presented on the main thread. dispatch_async(dispatch_get_main_queue(), ^{ - CDVCameraPicker* cameraPicker = [CDVCameraPicker createFromPictureOptions:pictureOptions]; + CDVImagePickerController* cameraPicker = [CDVImagePickerController createFromPictureOptions:pictureOptions]; self.pickerController = cameraPicker; cameraPicker.delegate = self; @@ -931,7 +931,7 @@ static NSString* MIME_JPEG = @"image/jpeg"; - (void)imagePickerController:(UIImagePickerController*)picker didFinishPickingMediaWithInfo:(NSDictionary*)info { - __weak CDVCameraPicker* cameraPicker = (CDVCameraPicker*)picker; + __weak CDVImagePickerController* cameraPicker = (CDVImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^(void) { @@ -973,7 +973,7 @@ static NSString* MIME_JPEG = @"image/jpeg"; - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker { - __weak CDVCameraPicker* cameraPicker = (CDVCameraPicker*)picker; + __weak CDVImagePickerController* cameraPicker = (CDVImagePickerController*)picker; __weak CDVCamera* weakSelf = self; dispatch_block_t invoke = ^ (void) { @@ -1172,7 +1172,7 @@ static NSString* MIME_JPEG = @"image/jpeg"; @end -@implementation CDVCameraPicker +@implementation CDVImagePickerController - (BOOL)prefersStatusBarHidden { @@ -1196,7 +1196,7 @@ static NSString* MIME_JPEG = @"image/jpeg"; + (instancetype)createFromPictureOptions:(CDVPictureOptions*)pictureOptions { - CDVCameraPicker* cameraPicker = [[CDVCameraPicker alloc] init]; + CDVImagePickerController* cameraPicker = [[CDVImagePickerController alloc] init]; cameraPicker.pictureOptions = pictureOptions; cameraPicker.sourceType = pictureOptions.sourceType; cameraPicker.allowsEditing = pictureOptions.allowsEditing; diff --git a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m index 68e0421..696d7b4 100644 --- a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m +++ b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m @@ -117,7 +117,7 @@ { NSArray* args; CDVPictureOptions* pictureOptions; - CDVCameraPicker* picker; + CDVImagePickerController* picker; // Source is Camera, uses always UIImagePickerController args = @[ @@ -138,7 +138,7 @@ pictureOptions = [CDVPictureOptions createFromTakePictureArguments:command]; if ([UIImagePickerController isSourceTypeAvailable:pictureOptions.sourceType]) { - picker = [CDVCameraPicker createFromPictureOptions:pictureOptions]; + picker = [CDVImagePickerController createFromPictureOptions:pictureOptions]; XCTAssertEqualObjects(picker.pictureOptions, pictureOptions); @@ -168,7 +168,7 @@ pictureOptions = [CDVPictureOptions createFromTakePictureArguments:command]; if ([UIImagePickerController isSourceTypeAvailable:pictureOptions.sourceType]) { - picker = [CDVCameraPicker createFromPictureOptions:pictureOptions]; + picker = [CDVImagePickerController createFromPictureOptions:pictureOptions]; XCTAssertEqualObjects(picker.pictureOptions, pictureOptions); @@ -197,7 +197,7 @@ pictureOptions = [CDVPictureOptions createFromTakePictureArguments:command]; if ([UIImagePickerController isSourceTypeAvailable:pictureOptions.sourceType]) { - picker = [CDVCameraPicker createFromPictureOptions:pictureOptions]; + picker = [CDVImagePickerController createFromPictureOptions:pictureOptions]; XCTAssertEqualObjects(picker.pictureOptions, pictureOptions); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
