Merge pull request #49 from miguelpruivo/beta

minor fix on Android
miguelpruivo · Mar 13, 2019 · 094d0cd · 094d0cd
2 parents d026ae9 + f4c7186
commit 094d0cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.1
+
+**Bug fix:** Fixes an issue on Android, where other activity would try to call `FilePicker`'s result object when it shouldn't.  
+
 ## 1.3.0
 
 **Breaking changes**
@@ -63,7 +67,7 @@
 * Replaces commons dependency with FilePath class on Android, to handle path resolution on different SDK. 
 
 ## 0.1.5
-* Minor correction on README file. 
+* Minor correction in the README file. 
 
 ## 0.1.4
 * Changed Meta minimum version due to versioning conflict with flutter_localization. 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ A package that allows you to use a native file explorer to pick single or multip
 First, add  *file_picker*  as a dependency in [your pubspec.yaml file](https://flutter.io/platform-plugins/).
 
 ```
-file_picker: ^1.3.0
+file_picker: ^1.3.1
 ```
 ### Android
 Add `<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>` to your app `AndroidManifest.xml` file. This is required due to file caching when a path is required from a remote file (eg. Google Drive).

diff --git a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java
@@ -81,8 +81,9 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
         } else if(requestCode == REQUEST_CODE && resultCode == Activity.RESULT_CANCELED) {
             result.success(null);
             return true;
+        } else if (requestCode == REQUEST_CODE) {
+          result.error(TAG, "Unknown activity error, please fill an issue." ,null);
         }
-        result.error(TAG, "Unknown activity error, please fill an issue." ,null);
         return false;
       }
     });

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: file_picker
 description: A package that allows you to use a native file explorer to pick single or multiple absolute file paths, with extensions filtering support.
 author: Miguel Ruivo <miguelpruivo@outlook.com>
 homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker
-version: 1.3.0
+version: 1.3.1
 
 
 dependencies: