diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md index 80c32809e4f5..6db21416fe26 100644 --- a/packages/camera/camera_avfoundation/CHANGELOG.md +++ b/packages/camera/camera_avfoundation/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.18+7 + +* Fixes crash when setting `activeFormat` on `FLTCaptureDevice`. + ## 0.9.18+6 * Refactors implementations to remove remaining usage of OCMock in internal testing. diff --git a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureDevice.m b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureDevice.m index f142a49dc4ff..41e75e9b2577 100644 --- a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureDevice.m +++ b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureDevice.m @@ -44,8 +44,8 @@ - (AVCaptureDevicePosition)position { return wrappedFormats; } -- (void)setActiveFormat:(AVCaptureDeviceFormat *)format { - self.device.activeFormat = format; +- (void)setActiveFormat:(NSObject *)format { + self.device.activeFormat = format.format; } // Flash/Torch diff --git a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCaptureDevice.h b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCaptureDevice.h index 6f5d6df0c202..76dc97173052 100644 --- a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCaptureDevice.h +++ b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCaptureDevice.h @@ -25,9 +25,8 @@ NS_ASSUME_NONNULL_BEGIN - (AVCaptureDevicePosition)position; // Format/Configuration -- (NSObject *)activeFormat; -- (NSArray *> *)formats; -- (void)setActiveFormat:(NSObject *)format; +@property(nonatomic, retain) NSObject *activeFormat; +@property(nonatomic, readonly) NSArray *> *formats; // Flash/Torch - (BOOL)hasFlash; diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml index 8ba6e0d06372..2dcc784d6316 100644 --- a/packages/camera/camera_avfoundation/pubspec.yaml +++ b/packages/camera/camera_avfoundation/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_avfoundation description: iOS implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.9.18+6 +version: 0.9.18+7 environment: sdk: ^3.4.0