Browse Source

Merge pull request #227 from palbert75/master

Do not call onReceiveValue on null reference
Simon Lightfoot 7 years ago
parent
commit
f14ca4f26f

+ 6 - 2
android/src/main/java/com/flutter_webview_plugin/WebviewManager.java

@@ -52,14 +52,18 @@ class WebviewManager {
                         handled = true;
                     }
                 }
-                mUploadMessageArray.onReceiveValue(results);
+                if (mUploadMessageArray != null){
+                    mUploadMessageArray.onReceiveValue(results);
+                }
                 mUploadMessageArray = null;
             }else {
                 if (requestCode == FILECHOOSER_RESULTCODE) {
                     if (null != mUploadMessage) {
                         Uri result = intent == null || resultCode != RESULT_OK ? null
                                 : intent.getData();
-                        mUploadMessage.onReceiveValue(result);
+                        if (mUploadMessageArray != null){
+                            mUploadMessageArray.onReceiveValue(results);
+                        }
                         mUploadMessage = null;
                     }
                     handled = true;