Merge pull request #1615 from Lilian-C/fix-file-picker-delegate-nulls…

…afety Fix null safety in filepickerdelegate
miguelpruivo · Oct 19, 2024 · 36eccd1 · 36eccd1
2 parents 8bbe066 + 17e8637
commit 36eccd1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.1.3
+### Android
+- Fixes a null object reference error [#1604](https://github.com/miguelpruivo/flutter_file_picker/issues/1604)
+
 ## 8.1.2
 ### Android
 - Fixes a cache deletion issue [#1505](https://github.com/miguelpruivo/flutter_file_picker/issues/1505)

diff --git a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java
@@ -85,6 +85,9 @@ public boolean onActivityResult(final int requestCode, final int resultCode, fin
         // Save file
         if (requestCode == SAVE_FILE_CODE) {
             if (resultCode == Activity.RESULT_OK) {
+                if (data == null) {
+                    return false;
+                }
                 this.dispatchEventStatus(true);
                 final Uri uri = data.getData();
                 if (uri != null) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A package that allows you to use a native file explorer to pick sin
 homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker
 repository: https://github.com/miguelpruivo/flutter_file_picker
 issue_tracker: https://github.com/miguelpruivo/flutter_file_picker/issues
-version: 8.1.2
+version: 8.1.3
 
 dependencies:
   flutter: