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

[image_picker] return error in the event that permissions are not granted #1744

Merged
cyanglaz merged 11 commits into from
Jul 9, 2019
Merged

[image_picker] return error in the event that permissions are not granted #1744

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b77e4f
return error in the event that permissions are not granted
Jun 13, 2019
ad98c9d
increment version
Jun 13, 2019
9e0f7be
update CHANGELOG.md with description of changes
Jun 13, 2019
4ba17e6
update tests to reflect new expectations when permissions are denied
Jun 13, 2019
cd76a59
update to head and resolve merge conflicts
Jun 26, 2019
88d0636
Merge branch 'flutter-master'
Jun 26, 2019
a521133
Update version and changelog
Jun 26, 2019
4a0bbbc
Merge branch 'master' into master
jmacpherson Jul 8, 2019
d622d7c
refactor based on PR comments
Jul 8, 2019
6232d1b
Merge branch 'master' into master
jmacpherson Jul 9, 2019
1c750c3
Merge branch 'master' into master
Jul 9, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.0+11

* Android: throw exception when permissions denied

## 0.6.0+10

* iOS: support picking GIF from gallery.
Expand Down
8 changes: 8 additions & 0 deletions ...mage_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,21 +386,29 @@ public boolean onRequestPermissionsResult(
case REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION:
if (permissionGranted) {
launchPickImageFromGalleryIntent();
} else {
finishWithError("photo_access_denied", "The user did not allow photo access.");
Copy link
Contributor

@cyanglaz cyanglaz Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe combine these 4 statements in the if (!permissionGranted) clause?

Copy link
Contributor Author

@jmacpherson jmacpherson Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored per yr comment

}
break;
case REQUEST_EXTERNAL_VIDEO_STORAGE_PERMISSION:
if (permissionGranted) {
launchPickVideoFromGalleryIntent();
} else {
finishWithError("photo_access_denied", "The user did not allow photo access.");
}
break;
case REQUEST_CAMERA_IMAGE_PERMISSION:
if (permissionGranted) {
launchTakeImageWithCameraIntent();
} else {
finishWithError("camera_access_denied", "The user did not allow camera access.");
}
break;
case REQUEST_CAMERA_VIDEO_PERMISSION:
if (permissionGranted) {
launchTakeVideoWithCameraIntent();
} else {
finishWithError("camera_access_denied", "The user did not allow camera access.");
}
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions ...ple/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerDelegateTest.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/image_picker/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
- Flutter Team <[email protected]>
- Rhodes Davis Jr. <[email protected]>
homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
version: 0.6.0+10
version: 0.6.0+11

flutter:
plugin:
Expand Down