Skip to content
Closed
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/image_picker_android/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.12+1

* Fixes crashes caused by `handleChooseMultiImageResult` when selecting images with size 0.

## 0.8.12

* Fixes app crashes on Android 12+ caused by selecting images with size 0.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,10 @@ private void handleChooseMultiImageResult(int resultCode, Intent intent) {
null));
}
} else {
paths.add(new MediaPath(fileUtils.getPathFromUri(activity, intent.getData()), null));
Uri uri = intent.getData();
if (uri != null) {
paths.add(new MediaPath(fileUtils.getPathFromUri(activity, uri), null));
}
}
handleMediaResult(paths);
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,34 @@ public void onActivityResult_withUnknownRequest_returnsFalse() {
verifyNoMoreInteractions(mockResult);
}

@Test
public void onActivityResult_whenImagePickedFromGallery_finishesWithEmptyListIfClipDataIsNull() {
setupMockClipDataNullUri();
when(mockIntent.getData()).thenReturn(null);
when(mockIntent.getClipData()).thenReturn(null);

Mockito.doAnswer(
invocation -> {
((Runnable) invocation.getArgument(0)).run();
return null;
})
.when(mockExecutor)
.execute(any(Runnable.class));
ImagePickerDelegate delegate =
createDelegateWithPendingResultAndOptions(DEFAULT_IMAGE_OPTIONS, null);

delegate.onActivityResult(
ImagePickerDelegate.REQUEST_CODE_CHOOSE_MULTI_IMAGE_FROM_GALLERY,
Activity.RESULT_OK,
mockIntent);

@SuppressWarnings("unchecked")
ArgumentCaptor<List<String>> pathListCapture = ArgumentCaptor.forClass(List.class);
verify(mockResult).success(pathListCapture.capture());
assertEquals(0, pathListCapture.getValue().size());
verifyNoMoreInteractions(mockResult);
}

private ImagePickerDelegate createDelegate() {
return new ImagePickerDelegate(
mockActivity,
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: image_picker_android
description: Android implementation of the image_picker plugin.
repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
version: 0.8.12
version: 0.8.12+1

environment:
sdk: ^3.3.0
Expand Down