diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md index 40be3eb73977..ee65ab4c29cf 100644 --- a/packages/image_picker/CHANGELOG.md +++ b/packages/image_picker/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0+1 + +* Fix a crash when user calls the plugin in quick succession on Android. + ## 0.5.0 * **Breaking change**. Migrate from the deprecated original Android Support diff --git a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java index 3c6dab51da28..68a6aabc462a 100644 --- a/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java +++ b/packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerDelegate.java @@ -186,7 +186,7 @@ public void onScanCompleted(String path, Uri uri) { public void chooseVideoFromGallery(MethodCall methodCall, MethodChannel.Result result) { if (!setPendingMethodCallAndResult(methodCall, result)) { - finishWithAlreadyActiveError(); + finishWithAlreadyActiveError(result); return; } @@ -208,7 +208,7 @@ private void launchPickVideoFromGalleryIntent() { public void takeVideoWithCamera(MethodCall methodCall, MethodChannel.Result result) { if (!setPendingMethodCallAndResult(methodCall, result)) { - finishWithAlreadyActiveError(); + finishWithAlreadyActiveError(result); return; } @@ -242,7 +242,7 @@ private void launchTakeVideoWithCameraIntent() { public void chooseImageFromGallery(MethodCall methodCall, MethodChannel.Result result) { if (!setPendingMethodCallAndResult(methodCall, result)) { - finishWithAlreadyActiveError(); + finishWithAlreadyActiveError(result); return; } @@ -264,7 +264,7 @@ private void launchPickImageFromGalleryIntent() { public void takeImageWithCamera(MethodCall methodCall, MethodChannel.Result result) { if (!setPendingMethodCallAndResult(methodCall, result)) { - finishWithAlreadyActiveError(); + finishWithAlreadyActiveError(result); return; } @@ -482,8 +482,8 @@ private void finishWithSuccess(String imagePath) { clearMethodCallAndResult(); } - private void finishWithAlreadyActiveError() { - finishWithError("already_active", "Image picker is already active"); + private void finishWithAlreadyActiveError(MethodChannel.Result result) { + result.error("already_active", "Image picker is already active", null); } private void finishWithError(String errorCode, String errorMessage) { diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml index 895bad4929fa..73e267977f92 100755 --- a/packages/image_picker/pubspec.yaml +++ b/packages/image_picker/pubspec.yaml @@ -5,7 +5,7 @@ authors: - Flutter Team - Rhodes Davis Jr. homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker -version: 0.5.0 +version: 0.5.0+1 flutter: plugin: