Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 7860865

Browse files
hellohuanlinhellohuanlin
committed
[camera]handle access permission
1 parent ad146f1 commit 7860865

File tree

15 files changed

+278
-40
lines changed

15 files changed

+278
-40
lines changed

‎packages/camera/camera/CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
## 0.9.5
2+
3+
* Adds camera access permission handling on iOS to fix a related crash when first time using the camera.
4+
15
## 0.9.4+19
26

3-
* Migrate deprecated Scaffold SnackBar methods to ScaffoldMessenger.
7+
* Migrates deprecated Scaffold SnackBar methods to ScaffoldMessenger.
48

59
## 0.9.4+18
610

‎packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
E04F108627A87CA600573D0C /* FLTSavePhotoDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E04F108527A87CA600573D0C /* FLTSavePhotoDelegateTests.m */; };
2727
E071CF7227B3061B006EF3BA /* FLTCamPhotoCaptureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E071CF7127B3061B006EF3BA /* FLTCamPhotoCaptureTests.m */; };
2828
E071CF7427B31DE4006EF3BA /* FLTCamSampleBufferTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E071CF7327B31DE4006EF3BA /* FLTCamSampleBufferTests.m */; };
29+
E0B0D2BB27DFF2AF00E71E4B /* CameraPermissionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0B0D2BA27DFF2AF00E71E4B /* CameraPermissionTests.m */; };
2930
E0C6E2002770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FD2770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m */; };
3031
E0C6E2012770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FE2770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m */; };
3132
E0C6E2022770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C6E1FF2770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m */; };
@@ -91,6 +92,7 @@
9192
E04F108527A87CA600573D0C /* FLTSavePhotoDelegateTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTSavePhotoDelegateTests.m; sourceTree = "<group>"; };
9293
E071CF7127B3061B006EF3BA /* FLTCamPhotoCaptureTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTCamPhotoCaptureTests.m; sourceTree = "<group>"; };
9394
E071CF7327B31DE4006EF3BA /* FLTCamSampleBufferTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLTCamSampleBufferTests.m; sourceTree = "<group>"; };
95+
E0B0D2BA27DFF2AF00E71E4B /* CameraPermissionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraPermissionTests.m; sourceTree = "<group>"; };
9496
E0C6E1FD2770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeMethodChannelTests.m; sourceTree = "<group>"; };
9597
E0C6E1FE2770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeTextureRegistryTests.m; sourceTree = "<group>"; };
9698
E0C6E1FF2770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadSafeEventChannelTests.m; sourceTree = "<group>"; };
@@ -136,6 +138,7 @@
136138
E04F108527A87CA600573D0C /* FLTSavePhotoDelegateTests.m */,
137139
E071CF7127B3061B006EF3BA /* FLTCamPhotoCaptureTests.m */,
138140
E071CF7327B31DE4006EF3BA /* FLTCamSampleBufferTests.m */,
141+
E0B0D2BA27DFF2AF00E71E4B /* CameraPermissionTests.m */,
139142
E01EE4A72799F3A5008C1950 /* QueueUtilsTests.m */,
140143
E0CDBAC027CD9729002561D9 /* CameraTestUtils.h */,
141144
E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */,
@@ -279,11 +282,13 @@
279282
TargetAttributes = {
280283
03BB76672665316900CE5A93 = {
281284
CreatedOnToolsVersion = 12.5;
285+
DevelopmentTeam = S8QB4VV633;
282286
ProvisioningStyle = Automatic;
283287
TestTargetID = 97C146ED1CF9000F007C117D;
284288
};
285289
97C146ED1CF9000F007C117D = {
286290
CreatedOnToolsVersion = 7.3.1;
291+
DevelopmentTeam = S8QB4VV633;
287292
};
288293
};
289294
};
@@ -422,6 +427,7 @@
422427
788A065A27B0E02900533D74 /* StreamingTest.m in Sources */,
423428
E0C6E2022770F01A00EA6AA3 /* ThreadSafeEventChannelTests.m in Sources */,
424429
E0C6E2012770F01A00EA6AA3 /* ThreadSafeTextureRegistryTests.m in Sources */,
430+
E0B0D2BB27DFF2AF00E71E4B /* CameraPermissionTests.m in Sources */,
425431
E0C6E2002770F01A00EA6AA3 /* ThreadSafeMethodChannelTests.m in Sources */,
426432
E01EE4A82799F3A5008C1950 /* QueueUtilsTests.m in Sources */,
427433
);
@@ -479,7 +485,7 @@
479485
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
480486
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
481487
CODE_SIGN_STYLE = Automatic;
482-
DEVELOPMENT_TEAM = "";
488+
DEVELOPMENT_TEAM = S8QB4VV633;
483489
GCC_C_LANGUAGE_STANDARD = gnu11;
484490
INFOPLIST_FILE = RunnerTests/Info.plist;
485491
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -629,7 +635,7 @@
629635
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
630636
buildSettings = {
631637
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
632-
DEVELOPMENT_TEAM = "";
638+
DEVELOPMENT_TEAM = S8QB4VV633;
633639
ENABLE_BITCODE = NO;
634640
FRAMEWORK_SEARCH_PATHS = (
635641
"$(inherited)",

‎packages/camera/camera/example/ios/RunnerTests/CameraCaptureSessionQueueRaceConditionTests.m‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ - (void)testFixForCaptureSessionQueueNullPointerCrashDueToRaceCondition {
2929
result:^(id _Nullable result) {
3030
[disposeExpectation fulfill];
3131
}];
32-
[camera handleMethodCall:createCall
33-
result:^(id _Nullable result) {
34-
[createExpectation fulfill];
35-
}];
32+
[camera createCameraWithCreateMethodCall:createCall
33+
result:[[FLTThreadSafeFlutterResult alloc]
34+
initWithResult:^(id _Nullable result) {
35+
[createExpectation fulfill];
36+
}]];
3637
[self waitForExpectationsWithTimeout:1 handler:nil];
3738
// `captureSessionQueue` must not be nil after `create` call. Otherwise a nil
3839
// `captureSessionQueue` passed into `AVCaptureVideoDataOutput::setSampleBufferDelegate:queue:`

‎packages/camera/camera/example/ios/RunnerTests/CameraMethodChannelTests.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ - (void)testCreate_ShouldCallResultOnMainThread {
3737
methodCallWithMethodName:@"create"
3838
arguments:@{@"resolutionPreset" : @"medium", @"enableAudio" : @(1)}];
3939

40-
[camera handleMethodCallAsync:call result:resultObject];
40+
[camera createCameraWithCreateMethodCall:call result:resultObject];
4141

4242
// Verify the result
4343
NSDictionary *dictionaryResult = (NSDictionary *)resultObject.receivedResult;

‎packages/camera/camera/example/ios/RunnerTests/CameraPermissionTests.m‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
@import camera;
6+
@import camera.Test;
7+
@import AVFoundation;
8+
@import XCTest;
9+
#import <OCMock/OCMock.h>
10+
#import "CameraTestUtils.h"
11+
12+
@interface CameraPermissionTests : XCTestCase
13+
14+
@end
15+
16+
@implementation CameraPermissionTests
17+
18+
- (void)testRequestCameraPermission_completeWithoutErrorIfPrevoiuslyAuthorized {
19+
XCTestExpectation *expectation =
20+
[self expectationWithDescription:
21+
@"Must copmlete without error if camera access was previously authorized."];
22+
23+
id mockDevice = OCMClassMock([AVCaptureDevice class]);
24+
OCMStub([mockDevice authorizationStatusForMediaType:AVMediaTypeVideo])
25+
.andReturn(AVAuthorizationStatusAuthorized);
26+
27+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
28+
if (error == nil) {
29+
[expectation fulfill];
30+
}
31+
});
32+
[self waitForExpectationsWithTimeout:1 handler:nil];
33+
}
34+
- (void)testRequestCameraPermission_completeWithErrorIfPreviouslyDenied {
35+
XCTestExpectation *expectation =
36+
[self expectationWithDescription:
37+
@"Must complete with error if camera access was previously denied."];
38+
FlutterError *expectedError =
39+
[FlutterError errorWithCode:@"CameraAccessDeniedWithoutPrompt"
40+
message:@"User has previously denied the camera access request. Go to "
41+
@"Settings to enable camera access."
42+
details:nil];
43+
44+
id mockDevice = OCMClassMock([AVCaptureDevice class]);
45+
OCMStub([mockDevice authorizationStatusForMediaType:AVMediaTypeVideo])
46+
.andReturn(AVAuthorizationStatusDenied);
47+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
48+
if ([error isEqual:expectedError]) {
49+
[expectation fulfill];
50+
}
51+
});
52+
[self waitForExpectationsWithTimeout:1 handler:nil];
53+
}
54+
55+
- (void)testRequestCameraPermission_completeWithErrorIfRestricted {
56+
XCTestExpectation *expectation =
57+
[self expectationWithDescription:@"Must complete with error if camera access is restricted."];
58+
FlutterError *expectedError = [FlutterError errorWithCode:@"CameraAccessRestricted"
59+
message:@"Camera access is restricted. "
60+
details:nil];
61+
62+
id mockDevice = OCMClassMock([AVCaptureDevice class]);
63+
OCMStub([mockDevice authorizationStatusForMediaType:AVMediaTypeVideo])
64+
.andReturn(AVAuthorizationStatusRestricted);
65+
66+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
67+
if ([error isEqual:expectedError]) {
68+
[expectation fulfill];
69+
}
70+
});
71+
[self waitForExpectationsWithTimeout:1 handler:nil];
72+
}
73+
74+
- (void)testRequestCameraPermission_completeWithoutErrorIfUserGrantAccess {
75+
XCTestExpectation *grantedExpectation = [self
76+
expectationWithDescription:@"Must complete without error if user choose to grant access"];
77+
78+
id mockDevice = OCMClassMock([AVCaptureDevice class]);
79+
OCMStub([mockDevice authorizationStatusForMediaType:AVMediaTypeVideo])
80+
.andReturn(AVAuthorizationStatusNotDetermined);
81+
// Mimic user choosing "allow" in permission dialog.
82+
OCMStub([mockDevice requestAccessForMediaType:AVMediaTypeVideo
83+
completionHandler:[OCMArg checkWithBlock:^BOOL(void (^block)(BOOL)) {
84+
block(YES);
85+
return YES;
86+
}]]);
87+
88+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
89+
if (error == nil) {
90+
[grantedExpectation fulfill];
91+
}
92+
});
93+
[self waitForExpectationsWithTimeout:1 handler:nil];
94+
}
95+
96+
- (void)testRequestCameraPermission_completeWithErrorIfUserDenyAccess {
97+
XCTestExpectation *expectation =
98+
[self expectationWithDescription:@"Must complete with error if user choose to deny access"];
99+
FlutterError *expectedError =
100+
[FlutterError errorWithCode:@"CameraAccessDenied"
101+
message:@"User denied the camera access request."
102+
details:nil];
103+
104+
id mockDevice = OCMClassMock([AVCaptureDevice class]);
105+
OCMStub([mockDevice authorizationStatusForMediaType:AVMediaTypeVideo])
106+
.andReturn(AVAuthorizationStatusNotDetermined);
107+
108+
// Mimic user choosing "deny" in permission dialog.
109+
OCMStub([mockDevice requestAccessForMediaType:AVMediaTypeVideo
110+
completionHandler:[OCMArg checkWithBlock:^BOOL(void (^block)(BOOL)) {
111+
block(NO);
112+
return YES;
113+
}]]);
114+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
115+
if ([error isEqual:expectedError]) {
116+
[expectation fulfill];
117+
}
118+
});
119+
120+
[self waitForExpectationsWithTimeout:1 handler:nil];
121+
}
122+
123+
@end

‎packages/camera/camera/example/lib/main.dart‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,14 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
631631

632632
Future<void> onNewCameraSelected(CameraDescription cameraDescription) async {
633633
if (controller != null) {
634-
await controller!.dispose();
634+
final cameraController = controller!;
635+
// `controller` needs to be set to null before getting disposed,
636+
// to avoid a race condition when we use the controller that is being
637+
// disposed. This happens when camera permission dialog shows up,
638+
// which triggers `didChangeAppLifecycleState`, which disposes and
639+
// re-creates the controller.
640+
controller = null;
641+
await cameraController.dispose();
635642
}
636643

637644
final CameraController cameraController = CameraController(

‎packages/camera/camera/ios/Classes/CameraPermissionUtils.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
@import Foundation;
6+
#import <Flutter/Flutter.h>
7+
8+
typedef void (^FLTCameraPermissionRequestCompletionHandler)(FlutterError *);
9+
10+
/// Requests camera access permission.
11+
/// If it is the first time requesting camera access, a permission dialog will show up on the
12+
/// screen. Otherwise AVFoundation simply returns the user's previous choice, and in this case the
13+
/// user will have to update the choice in Settings app.
14+
/// @param handler if access permission is (or was previously) granted, completion handler will be
15+
/// called without error; Otherwise completion handler will be called with error. Handler can be
16+
/// called on an arbitrary dispatch queue.
17+
extern void FLTRequestCameraPermissionWithCompletionHandler(
18+
FLTCameraPermissionRequestCompletionHandler handler);

‎packages/camera/camera/ios/Classes/CameraPermissionUtils.m‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
@import AVFoundation;
6+
#import "CameraPermissionUtils.h"
7+
8+
void FLTRequestCameraPermissionWithCompletionHandler(
9+
FLTCameraPermissionRequestCompletionHandler handler) {
10+
switch ([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]) {
11+
case AVAuthorizationStatusAuthorized:
12+
handler(nil);
13+
break;
14+
case AVAuthorizationStatusNotDetermined: {
15+
[AVCaptureDevice
16+
requestAccessForMediaType:AVMediaTypeVideo
17+
completionHandler:^(BOOL granted) {
18+
// handler can be invoked on an arbitrary dispatch queue.
19+
handler(granted ? nil
20+
: [FlutterError
21+
errorWithCode:@"CameraAccessDenied"
22+
message:@"User denied the camera access request."
23+
details:nil]);
24+
}];
25+
break;
26+
}
27+
case AVAuthorizationStatusDenied:
28+
handler([FlutterError errorWithCode:@"CameraAccessDeniedWithoutPrompt"
29+
message:@"User has previously denied the camera access request. "
30+
@"Go to Settings to enable camera access."
31+
details:nil]);
32+
break;
33+
case AVAuthorizationStatusRestricted:
34+
handler([FlutterError errorWithCode:@"CameraAccessRestricted"
35+
message:@"Camera access is restricted. "
36+
details:nil]);
37+
break;
38+
}
39+
}

‎packages/camera/camera/ios/Classes/CameraPlugin.m‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
@import AVFoundation;
99

10+
#import "CameraPermissionUtils.h"
1011
#import "CameraProperties.h"
1112
#import "FLTCam.h"
1213
#import "FLTThreadSafeEventChannel.h"
@@ -131,31 +132,18 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call
131132
[result sendNotImplemented];
132133
}
133134
} else if ([@"create" isEqualToString:call.method]) {
134-
NSString *cameraName = call.arguments[@"cameraName"];
135-
NSString *resolutionPreset = call.arguments[@"resolutionPreset"];
136-
NSNumber *enableAudio = call.arguments[@"enableAudio"];
137-
NSError *error;
138-
FLTCam *cam = [[FLTCam alloc] initWithCameraName:cameraName
139-
resolutionPreset:resolutionPreset
140-
enableAudio:[enableAudio boolValue]
141-
orientation:[[UIDevice currentDevice] orientation]
142-
captureSessionQueue:_captureSessionQueue
143-
error:&error];
144-
145-
if (error) {
146-
[result sendError:error];
147-
} else {
148-
if (_camera) {
149-
[_camera close];
135+
FLTRequestCameraPermissionWithCompletionHandler(^(FlutterError *error) {
136+
// Create FLTCam only if granted camera access.
137+
if (error) {
138+
[result sendFlutterError:error];
139+
} else {
140+
// completionHandle may be called on an arbitrary dispatch queue.
141+
// Dispatch back to the capture session queue to create the camera.
142+
dispatch_async(self.captureSessionQueue, ^{
143+
[self createCameraWithCreateMethodCall:call result:result];
144+
});
150145
}
151-
_camera = cam;
152-
[self.registry registerTexture:cam
153-
completion:^(int64_t textureId) {
154-
[result sendSuccessWithData:@{
155-
@"cameraId" : @(textureId),
156-
}];
157-
}];
158-
}
146+
});
159147
} else if ([@"startImageStream" isEqualToString:call.method]) {
160148
[_camera startImageStreamWithMessenger:_messenger];
161149
[result sendSuccess];
@@ -274,4 +262,33 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call
274262
}
275263
}
276264

265+
- (void)createCameraWithCreateMethodCall:(FlutterMethodCall *)createMethodCall
266+
result:(FLTThreadSafeFlutterResult *)result {
267+
NSString *cameraName = createMethodCall.arguments[@"cameraName"];
268+
NSString *resolutionPreset = createMethodCall.arguments[@"resolutionPreset"];
269+
NSNumber *enableAudio = createMethodCall.arguments[@"enableAudio"];
270+
NSError *error;
271+
FLTCam *cam = [[FLTCam alloc] initWithCameraName:cameraName
272+
resolutionPreset:resolutionPreset
273+
enableAudio:[enableAudio boolValue]
274+
orientation:[[UIDevice currentDevice] orientation]
275+
captureSessionQueue:_captureSessionQueue
276+
error:&error];
277+
278+
if (error) {
279+
[result sendError:error];
280+
} else {
281+
if (_camera) {
282+
[_camera close];
283+
}
284+
_camera = cam;
285+
[self.registry registerTexture:cam
286+
completion:^(int64_t textureId) {
287+
[result sendSuccessWithData:@{
288+
@"cameraId" : @(textureId),
289+
}];
290+
}];
291+
}
292+
}
293+
277294
@end

‎packages/camera/camera/ios/Classes/CameraPlugin.modulemap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ framework module camera {
66

77
explicit module Test {
88
header "CameraPlugin_Test.h"
9+
header "CameraPermissionUtils.h"
910
header "CameraProperties.h"
1011
header "FLTCam.h"
1112
header "FLTCam_Test.h"

0 commit comments

Comments
 (0)