2. Check that a required runtime permission has been granted. The takeImageWithCamera() method - * checks that {@link Manifest.permission#CAMERA} has been granted. - * - *
The permission check can end up in two different outcomes: - * - *
A) If the permission has already been granted, continue with picking the image from gallery or - * camera. - * - *
B) If the permission hasn't already been granted, ask for the permission from the user. If the - * user grants the permission, proceed with step #3. If the user denies the permission, stop doing - * anything else and finish with a null result. - * - *
3. Launch the gallery or camera for picking the image, depending on whether + *
2. Launch the gallery or camera for picking the image, depending on whether * chooseImageFromGallery() or takeImageWithCamera() was called. * *
This can end up in three different outcomes: @@ -69,15 +55,11 @@ enum CameraDevice { * *
C) User cancels picking an image. Finish with null result.
*/
-public class ImagePickerDelegate
- implements PluginRegistry.ActivityResultListener,
- PluginRegistry.RequestPermissionsResultListener {
+public class ImagePickerDelegate implements PluginRegistry.ActivityResultListener {
@VisibleForTesting static final int REQUEST_CODE_CHOOSE_IMAGE_FROM_GALLERY = 2342;
@VisibleForTesting static final int REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA = 2343;
- @VisibleForTesting static final int REQUEST_CAMERA_IMAGE_PERMISSION = 2345;
@VisibleForTesting static final int REQUEST_CODE_CHOOSE_VIDEO_FROM_GALLERY = 2352;
@VisibleForTesting static final int REQUEST_CODE_TAKE_VIDEO_WITH_CAMERA = 2353;
- @VisibleForTesting static final int REQUEST_CAMERA_VIDEO_PERMISSION = 2355;
@VisibleForTesting final String fileProviderName;
@@ -85,20 +67,11 @@ public class ImagePickerDelegate
@VisibleForTesting final File externalFilesDirectory;
private final ImageResizer imageResizer;
private final ImagePickerCache cache;
- private final PermissionManager permissionManager;
private final IntentResolver intentResolver;
private final FileUriResolver fileUriResolver;
private final FileUtils fileUtils;
private CameraDevice cameraDevice;
- interface PermissionManager {
- boolean isPermissionGranted(String permissionName);
-
- void askForPermission(String permissionName, int requestCode);
-
- boolean needRequestCameraPermission();
- }
-
interface IntentResolver {
boolean resolveActivity(Intent intent);
}
@@ -129,23 +102,6 @@ public ImagePickerDelegate(
null,
null,
cache,
- new PermissionManager() {
- @Override
- public boolean isPermissionGranted(String permissionName) {
- return ActivityCompat.checkSelfPermission(activity, permissionName)
- == PackageManager.PERMISSION_GRANTED;
- }
-
- @Override
- public void askForPermission(String permissionName, int requestCode) {
- ActivityCompat.requestPermissions(activity, new String[] {permissionName}, requestCode);
- }
-
- @Override
- public boolean needRequestCameraPermission() {
- return ImagePickerUtils.needRequestCameraPermission(activity);
- }
- },
new IntentResolver() {
@Override
public boolean resolveActivity(Intent intent) {
@@ -187,7 +143,6 @@ public void onScanCompleted(String path, Uri uri) {
final MethodChannel.Result result,
final MethodCall methodCall,
final ImagePickerCache cache,
- final PermissionManager permissionManager,
final IntentResolver intentResolver,
final FileUriResolver fileUriResolver,
final FileUtils fileUtils) {
@@ -197,7 +152,6 @@ public void onScanCompleted(String path, Uri uri) {
this.fileProviderName = activity.getPackageName() + ".flutter.image_provider";
this.pendingResult = result;
this.methodCall = methodCall;
- this.permissionManager = permissionManager;
this.intentResolver = intentResolver;
this.fileUriResolver = fileUriResolver;
this.fileUtils = fileUtils;
@@ -269,13 +223,6 @@ public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result resu
return;
}
- if (needRequestCameraPermission()
- && !permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
- permissionManager.askForPermission(
- Manifest.permission.CAMERA, REQUEST_CAMERA_VIDEO_PERMISSION);
- return;
- }
-
launchTakeVideoWithCameraIntent();
}
@@ -328,22 +275,9 @@ public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result resu
return;
}
- if (needRequestCameraPermission()
- && !permissionManager.isPermissionGranted(Manifest.permission.CAMERA)) {
- permissionManager.askForPermission(
- Manifest.permission.CAMERA, REQUEST_CAMERA_IMAGE_PERMISSION);
- return;
- }
launchTakeImageWithCameraIntent();
}
- private boolean needRequestCameraPermission() {
- if (permissionManager == null) {
- return false;
- }
- return permissionManager.needRequestCameraPermission();
- }
-
private void launchTakeImageWithCameraIntent() {
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (cameraDevice == CameraDevice.FRONT) {
@@ -401,39 +335,6 @@ private void grantUriPermissions(Intent intent, Uri imageUri) {
}
}
- @Override
- public boolean onRequestPermissionsResult(
- int requestCode, String[] permissions, int[] grantResults) {
- boolean permissionGranted =
- grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
-
- switch (requestCode) {
- case REQUEST_CAMERA_IMAGE_PERMISSION:
- if (permissionGranted) {
- launchTakeImageWithCameraIntent();
- }
- break;
- case REQUEST_CAMERA_VIDEO_PERMISSION:
- if (permissionGranted) {
- launchTakeVideoWithCameraIntent();
- }
- break;
- default:
- return false;
- }
-
- if (!permissionGranted) {
- switch (requestCode) {
- case REQUEST_CAMERA_IMAGE_PERMISSION:
- case REQUEST_CAMERA_VIDEO_PERMISSION:
- finishWithError("camera_access_denied", "The user did not allow camera access.");
- break;
- }
- }
-
- return true;
- }
-
@Override
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
index bffc903b531e..b4e7e8a06ce3 100644
--- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
+++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java
@@ -192,11 +192,9 @@ private void setup(
// V1 embedding setup for activity listeners.
application.registerActivityLifecycleCallbacks(observer);
registrar.addActivityResultListener(delegate);
- registrar.addRequestPermissionsResultListener(delegate);
} else {
// V2 embedding setup for activity listeners.
activityBinding.addActivityResultListener(delegate);
- activityBinding.addRequestPermissionsResultListener(delegate);
lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(activityBinding);
lifecycle.addObserver(observer);
}
@@ -204,7 +202,6 @@ private void setup(
private void tearDown() {
activityBinding.removeActivityResultListener(delegate);
- activityBinding.removeRequestPermissionsResultListener(delegate);
activityBinding = null;
lifecycle.removeObserver(observer);
lifecycle = null;
diff --git a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
index da53b10b50f5..5b66814de761 100644
--- a/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
+++ b/packages/image_picker/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
@@ -14,7 +14,6 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -40,7 +39,6 @@ public class ImagePickerDelegateTest {
@Mock ImageResizer mockImageResizer;
@Mock MethodCall mockMethodCall;
@Mock MethodChannel.Result mockResult;
- @Mock ImagePickerDelegate.PermissionManager mockPermissionManager;
@Mock ImagePickerDelegate.IntentResolver mockIntentResolver;
@Mock FileUtils mockFileUtils;
@Mock Intent mockIntent;
@@ -104,11 +102,7 @@ public void chooseImageFromGallery_WhenPendingResultExists_FinishesWithAlreadyAc
}
@Test
- public void
- chooseImageFromGallery_WhenHasExternalStoragePermission_LaunchesChooseFromGalleryIntent() {
- when(mockPermissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
- .thenReturn(true);
-
+ public void chooseImageFromGallery_LaunchesChooseFromGalleryIntent() {
ImagePickerDelegate delegate = createDelegate();
delegate.chooseImageFromGallery(mockMethodCall, mockResult);
@@ -127,50 +121,31 @@ public void takeImageWithCamera_WhenPendingResultExists_FinishesWithAlreadyActiv
verifyNoMoreInteractions(mockResult);
}
- @Test
- public void takeImageWithCamera_WhenHasNoCameraPermission_RequestsForPermission() {
- when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(false);
- when(mockPermissionManager.needRequestCameraPermission()).thenReturn(true);
-
- ImagePickerDelegate delegate = createDelegate();
- delegate.takeImageWithCamera(mockMethodCall, mockResult);
-
- verify(mockPermissionManager)
- .askForPermission(
- Manifest.permission.CAMERA, ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION);
- }
-
- @Test
- public void takeImageWithCamera_WhenCameraPermissionNotPresent_RequestsForPermission() {
- when(mockPermissionManager.needRequestCameraPermission()).thenReturn(false);
- when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
-
- ImagePickerDelegate delegate = createDelegate();
- delegate.takeImageWithCamera(mockMethodCall, mockResult);
-
- verify(mockActivity)
- .startActivityForResult(
- any(Intent.class), eq(ImagePickerDelegate.REQUEST_CODE_TAKE_IMAGE_WITH_CAMERA));
- }
-
@Test
public void
- takeImageWithCamera_WhenHasCameraPermission_AndAnActivityCanHandleCameraIntent_LaunchesTakeWithCameraIntent() {
- when(mockPermissionManager.isPermissionGranted(Manifest.permission.CAMERA)).thenReturn(true);
+ takeImageWithCamera_WhenAnActivityCanHandleCameraIntent_LaunchesTakeWithCameraIntent() {
when(mockIntentResolver.resolveActivity(any(Intent.class))).thenReturn(true);
- ImagePickerDelegate delegate = createDelegate();
- delegate.takeImageWithCamera(mockMethodCall, mockResult);
+ MockedStatic