Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/image_picker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.0+15

* Android: throws an exception when permissions denied instead of ignoring.

## 0.6.0+14

* Fix typo in README.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,16 @@ public boolean onRequestPermissionsResult(
}

if (!permissionGranted) {
finishWithSuccess(null);
switch (requestCode) {
case REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION:
case REQUEST_EXTERNAL_VIDEO_STORAGE_PERMISSION:
finishWithError("photo_access_denied", "The user did not allow photo access.");
break;
case REQUEST_CAMERA_IMAGE_PERMISSION:
case REQUEST_CAMERA_VIDEO_PERMISSION:
finishWithError("camera_access_denied", "The user did not allow camera access.");
break;
}
}

return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ public void takeImageWithCamera_WhenCameraPermissionNotPresent_RequestsForPermis

@Test
public void
onRequestPermissionsResult_WhenReadExternalStoragePermissionDenied_FinishesWithNull() {
onRequestPermissionsResult_WhenReadExternalStoragePermissionDenied_FinishesWithError() {
ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();

delegate.onRequestPermissionsResult(
ImagePickerDelegate.REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION,
new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},
new int[] {PackageManager.PERMISSION_DENIED});

verify(mockResult).success(null);
verify(mockResult).error("photo_access_denied", "The user did not allow photo access.", null);
verifyNoMoreInteractions(mockResult);
}

Expand Down Expand Up @@ -227,15 +227,15 @@ public void takeImageWithCamera_WhenCameraPermissionNotPresent_RequestsForPermis
}

@Test
public void onRequestPermissionsResult_WhenCameraPermissionDenied_FinishesWithNull() {
public void onRequestPermissionsResult_WhenCameraPermissionDenied_FinishesWithError() {
ImagePickerDelegate delegate = createDelegateWithPendingResultAndMethodCall();

delegate.onRequestPermissionsResult(
ImagePickerDelegate.REQUEST_CAMERA_IMAGE_PERMISSION,
new String[] {Manifest.permission.CAMERA},
new int[] {PackageManager.PERMISSION_DENIED});

verify(mockResult).success(null);
verify(mockResult).error("camera_access_denied", "The user did not allow camera access.", null);
verifyNoMoreInteractions(mockResult);
}

Expand Down
3 changes: 2 additions & 1 deletion packages/image_picker/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ authors:
- Flutter Team <flutter-dev@googlegroups.com>
- Rhodes Davis Jr. <rody.davis.jr@gmail.com>
homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
version: 0.6.0+14

version: 0.6.0+15

flutter:
plugin:
Expand Down